From dd1cdd83fb9ab0c994cb95e7043c76a09090eac4 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 16 May 2014 08:48:51 +1000
Subject: [PATCH] Bug fix to previous commit

---
 sleepyhead/SleepLib/schema.h    |  8 ++++----
 sleepyhead/SleepLib/session.cpp |  8 ++++++++
 sleepyhead/daily.cpp            |  6 ++++++
 sleepyhead/statistics.cpp       | 22 +++++++++++-----------
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/sleepyhead/SleepLib/schema.h b/sleepyhead/SleepLib/schema.h
index f25757cc..1a5c8a9b 100644
--- a/sleepyhead/SleepLib/schema.h
+++ b/sleepyhead/SleepLib/schema.h
@@ -67,10 +67,10 @@ class Channel
     const QString &label() { return m_label; }
     const QString &units() { return m_unit; }
 
-    inline const EventDataType &upperThreshold() { return m_upperThreshold; }
-    inline const EventDataType &lowerThreshold() { return m_lowerThreshold; }
-    inline QColor &upperThresholdColor() { return m_upperThresholdColor; }
-    inline QColor &lowerThresholdColor() { return m_lowerThresholdColor; }
+    const EventDataType &upperThreshold() { return m_upperThreshold; }
+    const EventDataType &lowerThreshold() { return m_lowerThreshold; }
+    const QColor &upperThresholdColor() { return m_upperThresholdColor; }
+    const QColor &lowerThresholdColor() { return m_lowerThresholdColor; }
 
     const int &linkid() { return m_link; }
 
diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp
index 06e57da8..836d3605 100644
--- a/sleepyhead/SleepLib/session.cpp
+++ b/sleepyhead/SleepLib/session.cpp
@@ -1660,6 +1660,9 @@ EventDataType Session::timeAboveThreshold(ChannelID id, EventDataType threshold)
             }
         }
     }
+    if (started) {
+        total += ti-started;
+    }
     EventDataType time = double(total) / 60000.0;
     return time;
 }
@@ -1697,6 +1700,11 @@ EventDataType Session::timeBelowThreshold(ChannelID id, EventDataType threshold)
             }
         }
     }
+
+    if (started) {
+        total += ti-started;
+    }
+
     EventDataType time = double(total) / 60000.0;
     return time;
 }
diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp
index 8f8c28db..f470a947 100644
--- a/sleepyhead/daily.cpp
+++ b/sleepyhead/daily.cpp
@@ -371,6 +371,12 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
         it.value()->AddLayer(new gXAxis(),LayerBottom,0,20);
     }
 
+    if (PROFILE.cpap->showLeakRedline()) {
+        schema::channel[CPAP_Leak].setUpperThreshold(PROFILE.cpap->leakRedline());
+    } else {
+        schema::channel[CPAP_Leak].setUpperThreshold(0); // switch it off
+    }
+
     layout->layout();
 
     QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday);
diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp
index d8c4d4a5..879bd40f 100644
--- a/sleepyhead/statistics.cpp
+++ b/sleepyhead/statistics.cpp
@@ -612,12 +612,6 @@ QString Statistics::GenerateHTML()
             name = ahitxt;
         } else if ((row.calc == SC_HOURS) || (row.calc == SC_COMPLIANCE)) {
             name = row.src;
-        } else if ((row.calc == SC_ABOVE) || (row.calc == SC_BELOW)) {
-            ChannelID id = schema::channel[row.src].id();
-            if ((id == NoChannel) || (!PROFILE.hasChannel(id))) {
-                continue;
-            }
-            name = calcnames[row.calc].arg(schema::channel[id].fullname()); //.arg(tr("threshold"));
         } else if (row.calc == SC_COLUMNHEADERS) {
             html += QString("<tr><td><b>%1</b></td>\n").arg(tr("Details"));
             for (int j=0; j < periods.size(); j++) {
@@ -656,17 +650,23 @@ QString Statistics::GenerateHTML()
         } else if (row.calc == SC_UNDEFINED) {
             continue;
         } else {
+            if (row.calc == SC_ABOVE) {
+                int i=5;
+            }
             ChannelID id = schema::channel[row.src].id();
             if ((id == NoChannel) || (!PROFILE.hasChannel(id))) {
                 continue;
             }
             name = calcnames[row.calc].arg(schema::channel[id].fullname());
         }
-        html += QString("<tr><td>%1</td>").arg(name);
+        QString line;
+        line += QString("<tr><td>%1</td>").arg(name);
         for (int j=0; j < periods.size(); j++) {
-            html += QString("<td>%2</td>")
-                .arg(row.value(periods.at(j).start,periods.at(j).end));
+            QString val=row.value(periods.at(j).start,periods.at(j).end);
+            line += QString("<td>%2</td>")
+                .arg(val);
         }
+        html += line;
         html += "</tr>\n";
     }
 
@@ -1230,7 +1230,7 @@ QString Statistics::GenerateHTML()
 QString StatisticsRow::value(QDate start, QDate end)
 {
     const int decimals=2;
-    QString value = "";
+    QString value;
     float days = PROFILE.countDays(type, start, end);
 
     // Handle special data sources first
@@ -1255,7 +1255,7 @@ QString StatisticsRow::value(QDate start, QDate end)
                 break;
             case SC_WAVG:
                 value = QString("%1").arg(p_profile->calcWavg(code, type, start, end), 0, 'f', decimals);
-                    break;
+                break;
             case SC_MEDIAN:
                 value = QString("%1").arg(p_profile->calcPercentile(code, 0.5F, type, start, end), 0, 'f', decimals);
                 break;