chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup in SleepStyle loader

Browse Source 
Minor improvement to mask pressure averaging used in unintentional leak calculations.
  Fix Y2K calculation in unused code in sleepstle_EDFInfo.cpp
  Update Release Notes
This commit is contained in:
Guy Scharf 2021-10-05 20:18:19 -07:00
parent 03238360c2
commit 7bffd78203
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Htmldocs/release_notes.html
View File

@ -11,6 +11,15 @@
<b>For other languages, go to:</b> <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> <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> <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> <b>Changes and fixes in OSCAR v1.3.0 Beta 3</b>
<br>Portions of OSCAR are © 2019-2021 by <br>Portions of OSCAR are © 2019-2021 by
<i>The OSCAR Team</i></p> <i>The OSCAR Team</i></p>

3
oscar/SleepLib/loader_plugins/sleepstyle_EDFinfo.cpp
View File

@ -99,6 +99,9 @@ QDateTime SleepStyleEDFInfo::getStartDT( QString dateTimeStr )
// dateStr = dateTimeStr.left(8); // dateStr = dateTimeStr.left(8);
// timeStr = dateTimeStr.right(8); // timeStr = dateTimeStr.right(8);
qDate = QDate::fromString(dateTimeStr.left(8), "dd.MM.yy"); 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"); qTime = QTime::fromString(dateTimeStr.right(8), "HH.mm.ss");
return QDateTime(qDate, qTime, Qt::UTC); return QDateTime(qDate, qTime, Qt::UTC);
} }

15
oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp
View File

@ -504,7 +504,7 @@ bool SleepStyleLoader::OpenRealTime(Machine *mach, const QString & fname, const
} }
} else if (es.label == "Pressure") { } else if (es.label == "Pressure") {
code = CPAP_MaskPressure; // First compute CPAP_Leak data
maskRecs = es.sampleCnt * edf.GetNumDataRecords(); maskRecs = es.sampleCnt * edf.GetNumDataRecords();
maskSignal = es; maskSignal = es;
float lpm = lpm20 - lpm4; float lpm = lpm20 - lpm4;
@ -517,11 +517,13 @@ bool SleepStyleLoader::OpenRealTime(Machine *mach, const QString & fname, const
for (int i = 0; i < maskRecs; i++) { for (int i = 0; i < maskRecs; i++) {
// Extract IPAP from mask pressure, which is a combination of IPAP and EPAP values // 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]; float mp = es.dataArray[i];
for (int j = 1; j < 9; j++) int jrange = 3; // Number on each side of center
if (i < maskRecs-j) int jstart = std::max(0, i-jrange);
mp = fmaxf(mp, es.dataArray[i+j]); 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 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; delete [] leakarray;
} }
// Now do normal processing for Mask Pressure
code = CPAP_MaskPressure;
} else if (es.label == "Leak") { } else if (es.label == "Leak") {
code = CPAP_LeakTotal; code = CPAP_LeakTotal;