From 7bffd782037207a9232fd4be025b7ac9948d082f Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Tue, 5 Oct 2021 20:18:19 -0700
Subject: [PATCH] Code cleanup in SleepStyle loader   Minor improvement to mask
 pressure averaging used in unintentional leak calculations.   Fix Y2K
 calculation in unused code in sleepstle_EDFInfo.cpp   Update Release Notes

---
 Htmldocs/release_notes.html                       |  9 +++++++++
 .../loader_plugins/sleepstyle_EDFinfo.cpp         |  3 +++
 .../SleepLib/loader_plugins/sleepstyle_loader.cpp | 15 ++++++++++-----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index 6ff6cc83..0d52aeeb 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -11,6 +11,15 @@
     <b>For other languages, go to:</b>
     <br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
     <p>
+    <b>Changes and fixes in OSCAR v1.3.0 xxx.x</b>
+    <br>Portions of OSCAR are © 2019-2021 by
+    <i>The OSCAR Team</i></p>
+    <ul>
+      <li>---------- Fixes to previous fixes (do not include in final release notes) ---------</li>
+      <li>[ffx] Improvement to pressure averaging in SleepStyle unintentional leak calculation.</li>
+      <li>[ffx] Fix Y2K issue in unused SleepStyle EDF handling code.</li>
+    </ul>
+    <p>
     <b>Changes and fixes in OSCAR v1.3.0 Beta 3</b>
     <br>Portions of OSCAR are © 2019-2021 by
     <i>The OSCAR Team</i></p>
diff --git a/oscar/SleepLib/loader_plugins/sleepstyle_EDFinfo.cpp b/oscar/SleepLib/loader_plugins/sleepstyle_EDFinfo.cpp
index 39721ed4..92b8b4c5 100644
--- a/oscar/SleepLib/loader_plugins/sleepstyle_EDFinfo.cpp
+++ b/oscar/SleepLib/loader_plugins/sleepstyle_EDFinfo.cpp
@@ -99,6 +99,9 @@ QDateTime SleepStyleEDFInfo::getStartDT( QString dateTimeStr )
 //    dateStr = dateTimeStr.left(8);
 //    timeStr = dateTimeStr.right(8);
     qDate = QDate::fromString(dateTimeStr.left(8), "dd.MM.yy");
+    if (qDate.year() < 2000) {
+        qDate = qDate.addYears(100);
+    }
     qTime = QTime::fromString(dateTimeStr.right(8), "HH.mm.ss");
     return QDateTime(qDate, qTime, Qt::UTC);
 }
diff --git a/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp b/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp
index 394a86be..01be2fe5 100644
--- a/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp
@@ -504,7 +504,7 @@ bool SleepStyleLoader::OpenRealTime(Machine *mach, const QString & fname, const
             }
 
         } else if (es.label == "Pressure") {
-            code = CPAP_MaskPressure;
+            // First compute CPAP_Leak data
             maskRecs = es.sampleCnt * edf.GetNumDataRecords();
             maskSignal = es;
             float lpm = lpm20 - lpm4;
@@ -517,11 +517,13 @@ bool SleepStyleLoader::OpenRealTime(Machine *mach, const QString & fname, const
                 for (int i = 0; i < maskRecs; i++) {
 
                     // Extract IPAP from mask pressure, which is a combination of IPAP and EPAP values
-                    // get maximum mask pressure over next several data points to make best guess at IPAP
+                    // get maximum mask pressure over several adjacent data points to make best guess at IPAP
                     float mp = es.dataArray[i];
-                    for (int j = 1; j < 9; j++)
-                        if (i < maskRecs-j)
-                            mp = fmaxf(mp, es.dataArray[i+j]);
+                    int jrange = 3; // Number on each side of center
+                    int jstart = std::max(0, i-jrange);
+                    int jend = (i+jrange)>maskRecs ? maskRecs : i+jrange;
+                    for (int j = jstart; j < jend; j++)
+                        mp = fmaxf(mp, es.dataArray[j]);
 
                     float press = mp * es.gain - 4.0; // Convert pressure to cmH2O and get difference from low end of adjustment curve
 
@@ -556,6 +558,9 @@ bool SleepStyleLoader::OpenRealTime(Machine *mach, const QString & fname, const
                 delete [] leakarray;
             }
 
+            // Now do normal processing for Mask Pressure
+            code = CPAP_MaskPressure;
+
         } else if (es.label == "Leak") {
             code = CPAP_LeakTotal;