Show TotalLeaks in Statistics where Unintentional not available, Fix non-existant plots (for Pat-Trig-Breaths on machines without it) showing in Overview, add rera & FL to stats where available

Graphs/gLineChart.cpp

@@ -60,6 +60,7 @@ void gLineChart::SetDay(Day *d)
         ChannelID code=m_codes[j];
         for (int i=0;i<d->size();i++) {
             Session *sess=d->getSessions()[i];
+            if (!sess->channelExists(code)) continue;
 
             tmp=sess->Min(code);
             if (min > tmp) min=tmp;

Graphs/gSummaryChart.cpp

@@ -130,6 +130,9 @@ void SummaryChart::SetDay(Day * nullday)
                     if (day->machine_type()!=m_machinetype) continue;
                     //m_values[dn][j+1]=0;
 
+                    if (code==CPAP_PTB) {
+                        int i=5;
+                    }
                     bool hascode=//day->channelHasData(code) ||
                             type==ST_HOURS ||
                             type==ST_SESSIONS ||
@@ -137,6 +140,9 @@ void SummaryChart::SetDay(Day * nullday)
                             day->hasData(code,type);
 
                     if (hascode) {
+                        if (code==CPAP_PTB) {
+                            int i=5;
+                        }
                         m_days[dn]=day;
                         switch(m_type[j]) {
                             case ST_AVG: tmp=day->avg(code); break;

SleepLib/day.cpp

@@ -306,7 +306,11 @@ EventDataType Day::Min(ChannelID code)
     EventDataType tmp;
     bool first=true;
     for (QVector<Session *>::iterator s=sessions.begin();s!=sessions.end();s++) {
-        if (!(*s)->m_min.contains(code)) continue;
+        if (code==CPAP_PTB) {
+            int i=5;
+        }
+        if (!(*s)->m_min.contains(code))
+            continue;
         //if ((*s)->eventlist.find(code)==(*s)->eventlist.end()) continue;
         tmp=(*s)->Min(code);
         if (first) {

SleepLib/machine_common.h

@@ -64,6 +64,7 @@ enum PRTypes//:short
     PR_UNKNOWN=0,PR_NONE,PR_CFLEX,PR_CFLEXPLUS,PR_AFLEX,PR_BIFLEX,PR_EPR,PR_SMARTFLEX
 };
 
+
 //extern map<ChannelID,QString> DefaultMCShortNames;
 //extern map<ChannelID,QString> DefaultMCLongNames;
 //extern map<PRTypes,QString> PressureReliefNames;

SleepLib/schema.cpp

@@ -19,7 +19,7 @@ namespace schema {
 
 ChannelList channel;
 Channel EmptyChannel;
-Channel SessionEnabledChannel;
+Channel *SessionEnabledChannel;
 
 QHash<QString,ChanType> ChanTypes;
 QHash<QString,DataType> DataTypes;
@@ -33,8 +33,10 @@ void init()
     schema_initialized=true;
 
     EmptyChannel=Channel(0,DATA,DAY,"Empty","Empty Channel","","");
-    SessionEnabledChannel=Channel(1,DATA,DAY,"Enabled","Session Enabled","","");
+    SessionEnabledChannel=new Channel(1,DATA,DAY,"Enabled","Session Enabled","","");
 
+    channel.channels[1]=SessionEnabledChannel;
+    channel.names["Enabled"]=SessionEnabledChannel;
     SESSION_ENABLED=1;
     ChanTypes["data"]=DATA;
     //Types["waveform"]=WAVEFORM;

SleepLib/session.cpp

@@ -601,6 +601,9 @@ void Session::UpdateSummaries()
 
     for (c=eventlist.begin();c!=eventlist.end();c++) {
         id=c.key();
+        if (id==CPAP_PTB) {
+            int i=5;
+        }
         if (schema::channel[id].type()==schema::DATA) {
             //sum(id); // avg calculates this and cnt.
             if (c.value().size()>0) {
@@ -652,6 +655,9 @@ bool Session::SearchEvent(ChannelID code, qint64 time, qint64 dist)
 
 EventDataType Session::Min(ChannelID id)
 {
+    if (id==CPAP_PTB){
+        int i=5;
+    }
     QHash<ChannelID,EventDataType>::iterator i=m_min.find(id);
     if (i!=m_min.end())
         return i.value();

docs/channels.xml

@@ -187,8 +187,8 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!!
   </channel>
   <channel id="0xe201" class="setting" scope="!session" name="EPR" details="EPR Mode" label="EPR Mode" type="integer">
    <Option id="0" value="Off"/>
-   <Option id="1" value="EPR"/>
+   <Option id="1" value="Ramp Only"/>
-   <Option id="2" value="EPR?"/>
+   <Option id="2" value="Full Time"/>
    <Option id="3" value="EPR?"/>
   </channel>
   <channel id="0xe202" class="setting" scope="!session" name="EPRSet" details="EPR Setting" label="EPR Setting" type="integer">

mainwindow.cpp

@@ -422,6 +422,8 @@ struct RXChange
         per2=copy.per2;
         highlight=copy.highlight;
         weighted=copy.weighted;
+        prelief=copy.prelief;
+        prelset=copy.prelset;
     }
     QDate first;
     QDate last;
@@ -433,6 +435,8 @@ struct RXChange
     EventDataType per1;
     EventDataType per2;
     EventDataType weighted;
+    PRTypes prelief;
+    short prelset;
     short highlight;
 };
 
@@ -533,10 +537,7 @@ void MainWindow::on_summaryButton_clicked()
     if (cpap6month<firstcpap) cpap6month=firstcpap;
     if (cpapyear<firstcpap) cpapyear=firstcpap;
 
-    int cpapweekdays=cpapweek.daysTo(lastcpap);
+
-    int cpapmonthdays=cpapmonth.daysTo(lastcpap);
-    int cpapyeardays=cpapyear.daysTo(lastcpap);
-    int cpap6monthdays=cpap6month.daysTo(lastcpap);
     QList<Machine *> cpap_machines=PROFILE.GetMachines(MT_CPAP);
     QList<Machine *> oximeters=PROFILE.GetMachines(MT_OXIMETER);
     QList<Machine *> mach;
@@ -552,6 +553,11 @@ void MainWindow::on_summaryButton_clicked()
         return;
     }
     int cpapdays=PROFILE.countDays(MT_CPAP,firstcpap,lastcpap);
+    int cpapweekdays=PROFILE.countDays(MT_CPAP,cpapweek,lastcpap);
+    int cpapmonthdays=PROFILE.countDays(MT_CPAP,cpapmonth,lastcpap);
+    int cpapyeardays=PROFILE.countDays(MT_CPAP,cpapyear,lastcpap);
+    int cpap6monthdays=PROFILE.countDays(MT_CPAP,cpap6month,lastcpap);
+
     CPAPMode cpapmode=(CPAPMode)p_profile->calcSettingsMax(CPAP_Mode,MT_CPAP,firstcpap,lastcpap);
 
     float percentile=0.95;
@@ -590,6 +596,28 @@ void MainWindow::on_summaryButton_clicked()
             .arg(calcAHI(cpap6month,lastcpap),0,'f',3)
             .arg(calcAHI(cpapyear,lastcpap),0,'f',3);
 
+            if (PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpapyear,lastcpap)) {
+                html+=QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td><td>%6</td></tr>")
+                .arg(tr("RERA Index"))
+                .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,lastcpap,lastcpap)/PROFILE.calcHours(MT_CPAP,lastcpap,lastcpap),0,'f',3)
+                .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpapweek,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapweek,lastcpap),0,'f',3)
+                .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpapmonth,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapmonth,lastcpap),0,'f',3)
+                .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpap6month,lastcpap)/PROFILE.calcHours(MT_CPAP,cpap6month,lastcpap),0,'f',3)
+                .arg(PROFILE.calcCount(CPAP_RERA,MT_CPAP,cpapyear,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapyear,lastcpap),0,'f',3);
+            }
+
+            if (PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpapyear,lastcpap)) {
+                html+=QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td><td>%6</td></tr>")
+                .arg(tr("Flow Limit Index"))
+                .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,lastcpap,lastcpap)/PROFILE.calcHours(MT_CPAP,lastcpap,lastcpap),0,'f',3)
+                .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpapweek,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapweek,lastcpap),0,'f',3)
+                .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpapmonth,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapmonth,lastcpap),0,'f',3)
+                .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpap6month,lastcpap)/PROFILE.calcHours(MT_CPAP,cpap6month,lastcpap),0,'f',3)
+                .arg(PROFILE.calcCount(CPAP_FlowLimit,MT_CPAP,cpapyear,lastcpap)/PROFILE.calcHours(MT_CPAP,cpapyear,lastcpap),0,'f',3);
+            }
+
+
+
             html+=QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td><td>%6</td></tr>")
             .arg(tr("Hours per Night"))
             .arg(formatTime(p_profile->calcHours(MT_CPAP)))
@@ -654,20 +682,25 @@ void MainWindow::on_summaryButton_clicked()
             //html+="<tr><td colspan=6>TODO: 90% pressure.. Any point showing if this is all CPAP?</td></tr>";
 
 
+            ChannelID leak;
+            if (p_profile->calcCount(CPAP_LeakTotal,MT_CPAP,cpapyear,lastcpap)>0) {
+                leak=CPAP_LeakTotal;
+            } else leak=CPAP_Leak;
+
             html+=QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td><td>%6</td></tr>")
-            .arg(tr("Average Leaks"))
+            .arg(tr("Average %1").arg(schema::channel[leak].label()))
-            .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP),0,'f',3)
+            .arg(p_profile->calcWavg(leak,MT_CPAP),0,'f',3)
-            .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpapweek,lastcpap),0,'f',3)
+            .arg(p_profile->calcWavg(leak,MT_CPAP,cpapweek,lastcpap),0,'f',3)
-            .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpapmonth,lastcpap),0,'f',3)
+            .arg(p_profile->calcWavg(leak,MT_CPAP,cpapmonth,lastcpap),0,'f',3)
-            .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpap6month,lastcpap),0,'f',3)
+            .arg(p_profile->calcWavg(leak,MT_CPAP,cpap6month,lastcpap),0,'f',3)
-            .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpapyear,lastcpap),0,'f',3);
+            .arg(p_profile->calcWavg(leak,MT_CPAP,cpapyear,lastcpap),0,'f',3);
             html+=QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td><td>%6</td></tr>")
-            .arg(tr("Median Leaks"))
+            .arg(tr("%1% %2").arg(percentile*100.0f,0,'f',0).arg(schema::channel[leak].label()))
-            .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP),0,'f',3)
+            .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP),0,'f',3)
-            .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpapweek,lastcpap),0,'f',3)
+            .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpapweek,lastcpap),0,'f',3)
-            .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpapmonth,lastcpap),0,'f',3)
+            .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpapmonth,lastcpap),0,'f',3)
-            .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpap6month,lastcpap),0,'f',3)
+            .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpap6month,lastcpap),0,'f',3)
-            .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpapyear,lastcpap),0,'f',3);
+            .arg(p_profile->calcPercentile(leak,percentile,MT_CPAP,cpapyear,lastcpap),0,'f',3);
             html+="<tr><td colspan=6>Note, AHI calcs here are different to overview calcs.. Overview shows a average of the dialy AHI's, this shows combined counts divide by combined hours</td></tr>";
         }
     }
@@ -755,6 +788,8 @@ void MainWindow::on_summaryButton_clicked()
         QDate first,last=lastcpap;
         CPAPMode mode,cmode=MODE_UNKNOWN;
         EventDataType cmin=0,cmax=0,min,max;
+        PRTypes prelief=PR_UNKNOWN;
+        short prelset=0;
         QDate date=lastcpap;
         Day * day;
         bool lastchanged=false;
@@ -800,6 +835,8 @@ void MainWindow::on_summaryButton_clicked()
                         rx.mode=cmode;
                         rx.min=cmin;
                         rx.max=cmax;
+                        rx.prelief=prelief;
+                        rx.prelset=prelset;
                         if (mode<MODE_BIPAP) {
                             rx.per1=p_profile->calcPercentile(CPAP_Pressure,percentile,MT_CPAP,first,last);
                             rx.per2=0;