More Printing work, plus CPH/SPH fixes, added % PB graph

Graphs/gBarChart.cpp

@@ -76,8 +76,8 @@ void SummaryChart::SetDay(Day * nullday)
                         case ST_MIN: tmp=day->min(code); break;
                         case ST_MAX: tmp=day->max(code); break;
                         case ST_CNT: tmp=day->count(code); break;
-                        case ST_CPH: tmp=day->count(code)/day->hours(); break;
+                        case ST_CPH: tmp=day->cph(code); break;
-                        case ST_SPH: tmp=day->sum(code)/day->hours(); break;
+                        case ST_SPH: tmp=day->sph(code); break;
                         case ST_HOURS: tmp=day->hours(); break;
                     default:    break;
                     }
@@ -311,6 +311,8 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
                 case ST_90P:  a+="90%"; break;
                 case ST_MIN:  a+="Min"; break;
                 case ST_MAX:  a+="Max"; break;
+                case ST_CPH:  a+=""; break;
+                case ST_SPH:  a+="%"; break;
                 case ST_HOURS: a+="Hours"; break;
                 default:
                     break;

SleepLib/day.cpp

@@ -297,6 +297,32 @@ EventDataType Day::max(ChannelID code)
     }
     return max;
 }
+EventDataType Day::cph(ChannelID code)
+{
+    EventDataType sum=0;
+    EventDataType h=0;
+    for (int i=0;i<sessions.size();i++) {
+        if (!sessions[i]->m_sum.contains(code)) continue;
+        sum+=sessions[i]->count(code);
+        h+=sessions[i]->hours();
+    }
+    sum/=h;
+    return sum;
+}
+
+EventDataType Day::sph(ChannelID code)
+{
+    EventDataType sum=0;
+    EventDataType h=0;
+    for (int i=0;i<sessions.size();i++) {
+        if (!sessions[i]->m_sum.contains(code)) continue;
+        sum+=sessions[i]->sum(code)/3600.0;
+        h+=sessions[i]->hours();
+    }
+    sum=(100.0/h)*sum;
+    return sum;
+}
+
 int Day::count(ChannelID code)
 {
     int sum=0;

SleepLib/day.h

@@ -30,6 +30,8 @@ public:
     int count(ChannelID code);
     EventDataType min(ChannelID code);
     EventDataType max(ChannelID code);
+    EventDataType cph(ChannelID code);
+    EventDataType sph(ChannelID code);
     EventDataType p90(ChannelID code);
     EventDataType avg(ChannelID code);
     EventDataType sum(ChannelID code);

mainwindow.cpp

@@ -192,11 +192,8 @@ void MainWindow::Startup()
 
 
     if (daily) daily->ReloadGraphs();
-
+    if (overview) overview->ReloadGraphs();
-    if (overview) {
+    if (report) report->ReloadGraphs();
-        overview->ReloadGraphs();
-    }
-    //if (report) report->Reload();
 
     qprogress->hide();
     qstatus->setText("");
@@ -235,10 +232,8 @@ void MainWindow::on_action_Import_Data_triggered()
         if (c) {
             profile->Save();
             if (daily) daily->ReloadGraphs();
-
+            if (overview) overview->ReloadGraphs();
-            if (overview) {
+            if (report) report->ReloadGraphs();
-                overview->ReloadGraphs();
-            }
             //qDebug() << "overview->ReloadGraphs();";
         }
         qstatus->setText("");

overview.cpp

@@ -108,6 +108,14 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     LK->AddLayer(lk);
     LK->AddLayer(new gXGrid());
 
+    NPB=new gGraph(GraphView,"% in PB",default_height,0);
+    NPB->AddLayer(npb=new SummaryChart(profile,"% PB",GT_BAR));
+    npb->addSlice(CPAP_CSR,QColor("light green"),ST_SPH);
+    NPB->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
+    gx=new gXAxis();
+    gx->setUtcFix(true);
+    NPB->AddLayer(gx,LayerBottom,0,gXAxis::Margin);
+    NPB->AddLayer(new gXGrid());
 
     //ReloadGraphs();
 

overview.h

@@ -30,8 +30,8 @@ public:
     void ReloadGraphs();
     //void UpdateGraphs();
 
-    gGraph *AHI,*UC,*PR,*LK;
+    gGraph *AHI,*UC,*PR,*LK,*NPB;
-    SummaryChart *bc,*uc,*pr,*lk;
+    SummaryChart *bc,*uc,*pr,*lk,*npb;
 
 private slots:
 /*    void on_drStart_dateChanged(const QDate &date);

report.cpp

@@ -25,11 +25,9 @@ Report::Report(QWidget *parent, gGraphView * shared, Daily * daily, Overview * o
 
     //GraphView->AddGraph(overview->AHI);
     GraphView->hide();
-    ui->startDate->setDate(profile->FirstDay());
-    ui->endDate->setDate(profile->LastDay());
 
     // Create a new graph, but reuse the layers..
-    int default_height=200;
+    int default_height=150;
     UC=new gGraph(GraphView,"Usage",default_height,0);
     /*uc=new SummaryChart(profile,"Hours",GT_BAR);
     uc->addSlice(EmptyChannel,QColor("green"),ST_HOURS); */
@@ -80,9 +78,26 @@ Report::Report(QWidget *parent, gGraphView * shared, Daily * daily, Overview * o
     LK->AddLayer(m_overview->lk);
     LK->AddLayer(new gXGrid());
 
+    NPB=new gGraph(GraphView,"% in PB",default_height,0);
+    NPB->AddLayer(npb=new SummaryChart(profile,"% PB",GT_BAR));
+    npb->addSlice(CPAP_CSR,QColor("light green"),ST_SPH);
+    NPB->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
+    gx=new gXAxis();
+    gx->setUtcFix(true);
+    NPB->AddLayer(gx,LayerBottom,0,gXAxis::Margin);
+    NPB->AddLayer(new gXGrid());
+
+    graphs.push_back(AHI);
+    graphs.push_back(UC);
+    graphs.push_back(PR);
+    graphs.push_back(LK);
+    graphs.push_back(NPB);
+
+
     GraphView->hideSplitter();
     //ui->webView->hide();
     m_ready=false;
+    ReloadGraphs();
 //    Reload();
 }
 
@@ -94,7 +109,16 @@ void Report::showEvent (QShowEvent * event)
 {
     QTimer::singleShot(0,this,SLOT(on_refreshButton_clicked()));
 }
+void Report::ReloadGraphs()
+{
+    ui->startDate->setDate(profile->FirstDay());
+    ui->endDate->setDate(profile->LastDay());
+    for (int i=0;i<graphs.size();i++) {
+        graphs[i]->setDay(NULL);
+        graphs[i]->ResetBounds();
+    }
 
+}
 void Report::resizeEvent(QResizeEvent *event)
 {
     QWidget::resizeEvent(event);
@@ -136,7 +160,7 @@ void Report::Reload()
     html+="<table border='1px'><tr><td valign=top><table border=0>";
 
     //html+="<i>This is a temporary scratch pad tab so I can see what's going on while designing printing code. These graphs are images, and not controllable.</i>";
-    if (!((*profile).Exists("FirstName") && (*profile).Exists("LastName"))) html+="<h1>Please edit your profile (in Preferences)</h1>"; else {
+    if (!((*profile).Exists("FirstName") && (*profile).Exists("LastName"))) html+="<h1>Please edit your profile</h1>"; else {
         html+="<tr><td>Name:</td><td>"+(*profile)["FirstName"].toString()+" "+(*profile)["LastName"].toString()+"</td></tr>";
     }
     if ((*profile).Exists("Address")&& !(*profile)["Address"].toString().isEmpty()) {
@@ -178,13 +202,9 @@ void Report::Reload()
     "<hr>";
 
 
-    QVector<gGraph *> graphs;
-    graphs.push_back(AHI);
-    graphs.push_back(UC);
-    graphs.push_back(PR);
-    graphs.push_back(LK);
 
     for (int i=0;i<graphs.size();i++) {
+        if (graphs[i]->isEmpty()) continue;
         QPixmap pixmap=Snapshot(graphs[i]);
         QByteArray byteArray;
         QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
@@ -216,15 +236,16 @@ void Report::on_endDate_dateChanged(const QDate &date)
 void Report::on_printButton_clicked()
 {
     QPrinter printer;
-    QPrintDialog *dialog = new QPrintDialog(&printer);
+    printer.setPrinterName("Print to File (PDF)");
-    //printer.setPrinterName("Print to File (PDF)");
+    printer.setOutputFormat(QPrinter::PdfFormat);
-    //printer.setOutputFormat(QPrinter::PdfFormat);
     printer.setPrintRange(QPrinter::AllPages);
     printer.setOrientation(QPrinter::Portrait);
     printer.setPaperSize(QPrinter::A4);
     printer.setResolution(QPrinter::HighResolution);
     printer.setFullPage(false);
     printer.setNumCopies(1);
+    printer.setPageMargins(10,10,10,10,QPrinter::Millimeter);
+    QPrintDialog *dialog = new QPrintDialog(&printer);
     //printer.setOutputFileName("printYou.pdf");
     if ( dialog->exec() == QDialog::Accepted) {
         ui->webView->print(&printer);

report.h

@@ -20,7 +20,9 @@ public:
     explicit Report(QWidget *parent, gGraphView * shared, Daily * daily, Overview * overview);
     ~Report();
     void Reload();
+    void ReloadGraphs();
     QPixmap Snapshot(gGraph * graph);
+
 protected:
     virtual void showEvent (QShowEvent * event);
 private slots:
@@ -39,8 +41,10 @@ private:
     Overview * m_overview;
     gGraphView * shared;
     gGraphView * GraphView;
-    gGraph *AHI,*UC,*PR,*LK;
+    gGraph *AHI,*UC,*PR,*LK,*NPB;
-    SummaryChart *bc,*uc,*pr,*lk;
+    SummaryChart *bc,*uc,*pr,*lk,*npb;
+    QVector<gGraph *> graphs;
+
     bool m_ready;
     virtual void resizeEvent(QResizeEvent *);
 };