Fix Max and 99% flag being swapped in Daily view Summary panel

Also some minor cleanups having a look over update module

sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp

@@ -1402,6 +1402,7 @@ int ResmedLoader::Open(QString &path, Profile *profile)
         }
 
         if ((++cnt % 10) == 0) {
+            // TODO: Change me to emit once MachineLoader is QObjectified...
             if (qprogress) { qprogress->setValue(10.0 + (float(cnt) / float(size) * 90.0)); }
 
             QApplication::processEvents();
@@ -2091,6 +2092,7 @@ bool ResmedLoader::LoadBRP(Session *sess, EDFParser &edf)
     return true;
 }
 
+// Convert EDFSignal data to sleepyheads Time-Delta Event format
 void ResmedLoader::ToTimeDelta(Session *sess, EDFParser &edf, EDFSignal &es, ChannelID code,
                                long recs, qint64 duration, EventDataType t_min, EventDataType t_max, bool square)
 {
@@ -2330,9 +2332,9 @@ bool ResmedLoader::LoadPLD(Session *sess, EDFParser &edf)
             //            es.digital_minimum*=1000.0;
             ToTimeDelta(sess, edf, es, code, recs, duration, 0, 0);
         } else if (matchSignal(code = CPAP_Leak, es.label)) {
-            es.gain *= 60;
+            es.gain *= 60.0;
-            es.physical_maximum *= 60;
+            es.physical_maximum *= 60.0;
-            es.physical_minimum *= 60;
+            es.physical_minimum *= 60.0;
             //            es.digital_maximum*=60.0;
             //            es.digital_minimum*=60.0;
             es.physical_dimension = "L/M";

sleepyhead/UpdaterWindow.cpp

@@ -191,29 +191,74 @@ void UpdaterWindow::requestFile()
             qint64)));
 }
 
+// Compare supplied version string with current version
+// < 0 = this one is newer or version supplied is dodgy, 0 = same, and > 0 there is a newer version
+int compareVersion(QString version)
+{
+    QStringList parts = version.split(".");
+    bool ok;
+
+    if (parts.size() < 3) {
+        // dodgy version string supplied.
+        return -1;
+    }
+
+    short major = parts[0].toInt(&ok);
+    if (!ok) return -1;
+
+    short minor = parts[1].toInt(&ok);
+    if (!ok) return -1;
+
+    short patch = parts[2].toInt(&ok);
+    if (!ok) return -1;
+
+    if (major > major_version) {
+        return 1;
+    } else if (major < major_version) {
+        return -1;
+    }
+
+    if (minor > minor_version) {
+        return 1;
+    } else if (minor < minor_version) {
+        return -1;
+    }
+
+    // Still here.. check patch version
+    if (patch > patch_number) {
+        return 1;
+    } else if (patch < patch_number) {
+        return -1;
+    }
+
+    // Versions match
+    return 0;
+}
+
 void UpdaterWindow::ParseUpdateXML(QIODevice *dev)
 {
     QXmlInputSource src(dev);
     QXmlSimpleReader reader;
     reader.setContentHandler(&updateparser);
-    UpdateStatus AcceptUpdates = PREF[STR_PREF_AllowEarlyUpdates].toBool() ? UPDATE_TESTING :
+    UpdateStatus AcceptUpdates = PREF[STR_PREF_AllowEarlyUpdates].toBool() ?
-                                 UPDATE_BETA;
+                                 UPDATE_TESTING : UPDATE_BETA;
 
     if (reader.parse(src)) {
         ui->plainTextEdit->appendPlainText(tr("XML update structure parsed cleanly"));
 
         QStringList versions;
 
-        for (QHash<QString, Release>::iterator it = updateparser.releases.begin();
+        for (auto it = updateparser.releases.begin(); it != updateparser.releases.end(); ++it) {
-                it != updateparser.releases.end(); it++) {
             versions.push_back(it.key());
         }
 
+        // Um... not optimal.
         qSort(versions);
 
         QString platform = PlatformString.toLower();
         release = nullptr;
 
+        // Find the highest version number available for this platform
         for (int i = versions.size() - 1; i >= 0; i--) {
             QString verstr = versions[i];
             release = &updateparser.releases[verstr];
@@ -264,7 +309,8 @@ void UpdaterWindow::ParseUpdateXML(QIODevice *dev)
         }
 
         if (!upq && !upd) {
-            mainwin->Notify(tr("No new updates were found for your platform."), tr("SleepyHead Updates"),
+            mainwin->Notify(tr("No new updates were found for your platform."),
+                            tr("SleepyHead Updates"),
                             5000);
             PREF[STR_GEN_UpdatesLastChecked] = QDateTime::currentDateTime();
             close();
@@ -281,22 +327,22 @@ void UpdaterWindow::ParseUpdateXML(QIODevice *dev)
 
 
         if (updates.size() > 0) {
-            QString html = "<html><h3>" + tr("SleepyHead v%1, codename \"%2\"").arg(release->version).arg(
+            QString html = "<html><h3>" + tr("SleepyHead v%1, codename \"%2\"").arg(release->version).
-                               release->codename) + "</h3><p>" + release->notes[""] + "</p><b>";
+                    arg(release->codename) + "</h3><p>" + release->notes[""] + "</p><b>";
             html += platform.left(1).toUpper() + platform.mid(1);
             html += " " + tr("platform notes") + "</b><p>" + release->notes[platform] + "</p></html>";
             ui->webView->setHtml(html);
             QString info;
 
-            if (VersionString < release->version) {
+            if (compareVersion(release->version)) {
                 ui->Title->setText("<font size=+1>" + tr("A new version of SleepyHead is available!") + "</font>");
-                info = tr("Shiny new <b>v%1</b> is available. You're running old and busted v%2").arg(
+                info = tr("Shiny new <b>v%1</b> is available. You're running old and busted v%2").
-                           latestapp).arg(FullVersionString);
+                        arg(latestapp).arg(FullVersionString);
                 ui->notesTabWidget->setCurrentIndex(0);
             } else {
                 ui->Title->setText("<font size=+1>" + tr("An update for SleepyHead is available.") + "</font>");
-                info = tr("Version <b>%1</b> is available. You're currently running v%1").arg(latestapp).arg(
+                info = tr("Version <b>%1</b> is available. You're currently running v%1").
-                           FullVersionString);
+                        arg(latestapp).arg(FullVersionString);
                 ui->notesTabWidget->setCurrentIndex(1);
             }
 

sleepyhead/daily.cpp

@@ -554,6 +554,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
                 && (code!=CPAP_UserFlag3)
                 && (code!=CPAP_NRI)
                 && (code!=CPAP_LeakFlag)
+                && (code!=PRS1_10)
                 && (code!=CPAP_ExP)
                 && (code!=CPAP_FlowLimit)
                 && (code!=CPAP_PressurePulse)
@@ -1021,7 +1022,7 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos)
 
     float percentile=PROFILE.general->prefCalcPercentile()/100.0;
 
-    SummaryType ST_max=PROFILE.general->prefCalcMax() ? ST_MAX : ST_PERC;
+    SummaryType ST_max=PROFILE.general->prefCalcMax() ? ST_PERC : ST_MAX;
     const EventDataType maxperc=0.995F;
 
     QString midname;
@@ -1069,7 +1070,7 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos)
 
             if (!schema::channel[code].units().isEmpty()) tooltip+=" ("+schema::channel[code].units()+")";
 
-            if (ST_max==ST_MAX) {
+            if (ST_max == ST_MAX) {
                 mx=day->Max(code);
             } else {
                 mx=day->percentile(code,maxperc);