Added time above & below threshold calculation capability

sleepyhead/Graphs/gLineChart.cpp

@@ -254,6 +254,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
     painter.setRenderHint(QPainter::Antialiasing, true);
 
     if (m_threshold > 0) {
+        m_threshold_color.setAlpha(80);
         painter.setPen(m_threshold_color);
         int xst = left + 1;
         int yst = top + height + 1;

sleepyhead/SleepLib/day.cpp

@@ -55,6 +55,39 @@ void Day::AddSession(Session *s)
     sessions.push_back(s);
 }
 
+EventDataType Day::timeAboveThreshold(ChannelID code, EventDataType threshold)
+{
+    EventDataType val = 0;
+
+    QList<Session *>::iterator end = sessions.end();
+    for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
+        Session &sess = *(*it);
+
+        if (sess.enabled()) {
+            val += sess.timeAboveThreshold(code,threshold);
+        }
+    }
+
+    return val;
+}
+
+EventDataType Day::timeBelowThreshold(ChannelID code, EventDataType threshold)
+{
+    EventDataType val = 0;
+
+    QList<Session *>::iterator end = sessions.end();
+    for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
+        Session &sess = *(*it);
+
+        if (sess.enabled()) {
+            val += sess.timeBelowThreshold(code,threshold);
+        }
+    }
+
+    return val;
+}
+
+
 EventDataType Day::settings_sum(ChannelID code)
 {
     EventDataType val = 0;

sleepyhead/SleepLib/day.h

@@ -97,6 +97,13 @@ class Day
     //! \brief Returns the Maximum of all Sessions setting 'code' for this day
     EventDataType settings_max(ChannelID code);
 
+    //! \brief Returns the amount of time (in decimal minutes) the Channel spent above the threshold
+    EventDataType timeAboveThreshold(ChannelID id, EventDataType threshold);
+
+    //! \brief Returns the amount of time (in decimal minutes) the Channel spent below the threshold
+    EventDataType timeBelowThreshold(ChannelID id, EventDataType threshold);
+
+
     //! \brief Returns the first session time of this day
     qint64 first();
 

sleepyhead/SleepLib/profiles.cpp

@@ -727,6 +727,7 @@ double Profile::calcSum(ChannelID code, MachineType mt, QDate start, QDate end)
 
     return val;
 }
+
 EventDataType Profile::calcHours(MachineType mt, QDate start, QDate end)
 {
     if (!start.isValid()) {
@@ -757,6 +758,72 @@ EventDataType Profile::calcHours(MachineType mt, QDate start, QDate end)
 
     return val;
 }
+
+EventDataType Profile::calcAboveThreshold(ChannelID code, EventDataType threshold, MachineType mt,
+                                 QDate start, QDate end)
+{
+    if (!start.isValid()) {
+        start = LastGoodDay(mt);
+    }
+
+    if (!end.isValid()) {
+        end = LastGoodDay(mt);
+    }
+
+    QDate date = start;
+
+    if (date.isNull()) {
+        return 0;
+    }
+
+    double val = 0;
+
+    do {
+        Day *day = GetGoodDay(date, mt);
+
+        if (day) {
+            val += day->timeAboveThreshold(code, threshold);
+        }
+
+        date = date.addDays(1);
+    } while (date <= end);
+
+    return val;
+}
+
+EventDataType Profile::calcBelowThreshold(ChannelID code, EventDataType threshold, MachineType mt,
+                                 QDate start, QDate end)
+{
+    if (!start.isValid()) {
+        start = LastGoodDay(mt);
+    }
+
+    if (!end.isValid()) {
+        end = LastGoodDay(mt);
+    }
+
+    QDate date = start;
+
+    if (date.isNull()) {
+        return 0;
+    }
+
+    double val = 0;
+
+    do {
+        Day *day = GetGoodDay(date, mt);
+
+        if (day) {
+            val += day->timeBelowThreshold(code, threshold);
+        }
+
+        date = date.addDays(1);
+    } while (date <= end);
+
+    return val;
+}
+
+
 EventDataType Profile::calcAvg(ChannelID code, MachineType mt, QDate start, QDate end)
 {
     if (!start.isValid()) {
@@ -944,6 +1011,7 @@ EventDataType Profile::calcSettingsMin(ChannelID code, MachineType mt, QDate sta
 
     return min;
 }
+
 EventDataType Profile::calcSettingsMax(ChannelID code, MachineType mt, QDate start, QDate end)
 {
     if (!start.isValid()) {

sleepyhead/SleepLib/profiles.h

@@ -124,6 +124,12 @@ class Profile : public Preferences
     EventDataType calcSettingsMax(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
                                   QDate end = QDate());
 
+    EventDataType calcAboveThreshold(ChannelID code, EventDataType threshold, MachineType mt = MT_CPAP,
+                                     QDate start = QDate(), QDate end = QDate());
+
+    EventDataType calcBelowThreshold(ChannelID code, EventDataType threshold, MachineType mt = MT_CPAP,
+                                     QDate start = QDate(), QDate end = QDate());
+
     virtual void ExtraLoad(QDomElement &root);
     virtual QDomElement ExtraSave(QDomDocument &doc);
 

sleepyhead/SleepLib/session.cpp

@@ -1627,6 +1627,81 @@ EventDataType Session::sph(ChannelID id) // sum per hour, assuming id is a time
     return val;
 }
 
+EventDataType Session::timeAboveThreshold(ChannelID id, EventDataType threshold)
+{
+    QHash<ChannelID, QVector<EventList *> >::iterator j = eventlist.find(id);
+    if (j == eventlist.end()) {
+        return 0.0f;
+    }
+
+    QVector<EventList *> &evec = j.value();
+    int evec_size=evec.size();
+
+    qint64 ti, started=0, total=0;
+    EventDataType data;
+    int elsize;
+    for (int i = 0; i < evec_size; ++i) {
+        EventList &ev = *(evec[i]);
+        elsize = ev.count();
+
+        for (int j=0; j < elsize; ++j) {
+            ti=ev.time(j);
+            data=ev.data(j);
+
+            if (started == 0) {
+                if (data >= threshold) {
+                    started=ti;
+                }
+            } else {
+                if (data < threshold) {
+                    total += ti-started;
+                    started = 0;
+                }
+            }
+        }
+    }
+    EventDataType time = double(total) / 60000.0;
+    return time;
+}
+
+EventDataType Session::timeBelowThreshold(ChannelID id, EventDataType threshold)
+{
+    QHash<ChannelID, QVector<EventList *> >::iterator j = eventlist.find(id);
+    if (j == eventlist.end()) {
+        return 0.0f;
+    }
+
+    QVector<EventList *> &evec = j.value();
+    int evec_size=evec.size();
+
+    qint64 ti, started=0, total=0;
+    EventDataType data;
+    int elsize;
+    for (int i = 0; i < evec_size; ++i) {
+        EventList &ev = *(evec[i]);
+        elsize = ev.count();
+
+        for (int j=0; j < elsize; ++j) {
+            ti=ev.time(j);
+            data=ev.data(j);
+
+            if (started == 0) {
+                if (data <= threshold) {
+                    started=ti;
+                }
+            } else {
+                if (data > threshold) {
+                    total += ti-started;
+                    started = 0;
+                }
+            }
+        }
+    }
+    EventDataType time = double(total) / 60000.0;
+    return time;
+}
+
+
 bool sortfunction(EventStoreType i, EventStoreType j) { return (i < j); }
 
 EventDataType Session::percentile(ChannelID id, EventDataType percent)

sleepyhead/SleepLib/session.h

@@ -258,6 +258,12 @@ class Session
     //! \brief Returns (without caching) the requested Percentile of all events of type id
     EventDataType percentile(ChannelID id, EventDataType percentile);
 
+    //! \brief Returns the amount of time (in decimal minutes) the Channel spent above the threshold
+    EventDataType timeAboveThreshold(ChannelID id, EventDataType threshold);
+
+    //! \brief Returns the amount of time (in decimal minutes) the Channel spent below the threshold
+    EventDataType timeBelowThreshold(ChannelID id, EventDataType threshold);
+
     //! \brief Returns true if the channel has events loaded, or a record of a count for when they are not
     bool channelExists(ChannelID name);
 

sleepyhead/daily.cpp

@@ -1140,6 +1140,14 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos)
         html+="<tr><td colspan=5>&nbsp;</td></tr>\n";
         html+=QString("<tr><td colspan=5 align=center><i>%1</i></td></tr>").arg(tr("<b>Please Note:</b> This day just contains summary data, only limited information is available ."));
     }
+    if (cpap && PROFILE.cpap->showLeakRedline()) {
+        float rlt = cpap->timeAboveThreshold(CPAP_Leak, PROFILE.cpap->leakRedline()) / 60.0;
+        float pc = 100.0 / cpap->hours() * rlt;
+        html+="<tr><td colspan=5>&nbsp;</td></tr>";
+        html+="<tr><td colspan=3 align='left' bgcolor='white'><b>"+tr("Time over leak redline")+
+                QString("</b></td><td colspan=2 bgcolor='white'>%1%</td></tr>").arg(pc, 0, 'f', 3);
+    }
+
     html+="</table>\n";
     html+="<hr/>\n";
     return html;
@@ -1391,6 +1399,7 @@ void Daily::Load(QDate date)
     if ((cpap && !isBrick && (cpap->hours()>0)) || oxi || posit) {
 
         html+=getStatisticsInfo(cpap,oxi,posit);
+
     } else {
         if (cpap && cpap->hours()==0) {
         } else {