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

Merge branch 'master' into translations

Browse Source
This commit is contained in:
Arie Klerk Hotmail 2021-10-07 21:24:21 +02:00
commit 93e7dc1862
18 changed files with 396 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Htmldocs/release_notes.html
View File

@ -11,7 +11,36 @@
<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 Beta 1</b> <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>
<ul>
<li>[new] Add support for additional Viatom/Wellue filename conventions.</li>
<li>[new] Add support for unreadably low SpO2 samples on Viatom/Wellue oximeters.</li>
<li>[fix] Fix AVAPS pressure settings.</li>
<li>[fix] Check for Updates no longer shows test versions to release users.</li>
<li>[fix] Rx pressures shown correctly in Profile dialog.</li>
<li>[fix] Resolve empty CPAP data card zips on macOS Big Sur.</li>
<li>[fix] Always prompt for SD card location when zipping SD card.</li>
<li>[fix] Add script to identify platform in mkDistDeb.sh (Linux building).</li>
<li>---------- Fixes to previous fixes (do not include in final release notes) ---------</li>
<li>[ffx] Weight, BMI, and Zombie are on Overview, not Statistics page.</li>
<li>[ffx] Overview page updated correctly when Weight or Zombie values are changed.</li>
<li>[ffx] Various corrections to language files.</li>
<li>[ffx] SleepStyle loader now has higher resolution for leak rate (1 per second instead of 1 per 2 minutes).</li>
<li>[ffx] Correct problems with settings display for AirSense 11.</li>
</ul>
<p>
<b>Changes and fixes in OSCAR v1.3.0 Beta 2/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>
<ul> <ul>
@ -32,7 +61,7 @@
<li>[new] Improve Somnopose import options.</li> <li>[new] Improve Somnopose import options.</li>
<li>[new] Purge Current Selected Day allows purge of each machine type separately</li> <li>[new] Purge Current Selected Day allows purge of each machine type separately</li>
<li>[new] Multi-file import for non-CPAP loaders (Somnopose, Viatom, Zeo, Dreem)</li> <li>[new] Multi-file import for non-CPAP loaders (Somnopose, Viatom, Zeo, Dreem)</li>
<li>[new] Weight, BMI and Zombie history appear in statistics</li> <li>[new] Weight, BMI and Zombie history appear in Overview page</li>
<li>[new] Add Turkish signal names to RedMed loader.</li> <li>[new] Add Turkish signal names to RedMed loader.</li>
<li>[new] Add Traditional Chinese to languages available.</li> <li>[new] Add Traditional Chinese to languages available.</li>
<li>[fix] Correct calculation of average leak rate on Welcome page.</li> <li>[fix] Correct calculation of average leak rate on Welcome page.</li>

1
oscar/Graphs/gGraph.cpp
View File

@ -1300,6 +1300,7 @@ EventDataType gGraph::MinY()
} }
return rmin_y = val; return rmin_y = val;
// return rmin_y = val * 0.9;
} }
EventDataType gGraph::MaxY() EventDataType gGraph::MaxY()
{ {

36
oscar/SleepLib/day.cpp
View File

@ -848,11 +848,13 @@ ChannelID Day::getPressureChannelID() {
for (auto & preferredID : preferredIDs) { for (auto & preferredID : preferredIDs) {
// If preferred channel has data, return it // If preferred channel has data, return it
if (channelHasData(preferredID)) { if (channelHasData(preferredID)) {
//qDebug() << QString("Found pressure channel 0x%1").arg(preferredID, 4, 16, QChar('0')); // if ( cpapmode == MODE_AVAPS )
// qDebug() << QString("Found pressure channel 0x%1").arg(preferredID, 4, 16, QChar('0'));
return preferredID; return preferredID;
} }
} }
qDebug() << "No pressure channel for " << getCPAPModeStr();
return NoChannel; return NoChannel;
} }
@ -1582,13 +1584,21 @@ QString Day::getPressureSettings()
QString units = schema::channel[CPAP_Pressure].units(); QString units = schema::channel[CPAP_Pressure].units();
if (mode == MODE_CPAP) { if (mode == MODE_CPAP) {
return QObject::tr("Fixed %1 (%2)").arg(validPressure(settings_min(CPAP_Pressure))).arg(units); return QObject::tr("Fixed %1 (%2)").arg(validPressure(settings_min(CPAP_Pressure))).
arg(units);
} else if (mode == MODE_APAP) { } else if (mode == MODE_APAP) {
return QObject::tr("Min %1 Max %2 (%3)").arg(validPressure(settings_min(CPAP_PressureMin))).arg(validPressure(settings_max(CPAP_PressureMax))).arg(units); return QObject::tr("Min %1 Max %2 (%3)").arg(validPressure(settings_min(CPAP_PressureMin))).
arg(validPressure(settings_max(CPAP_PressureMax))).
arg(units);
} else if (mode == MODE_BILEVEL_FIXED ) { } else if (mode == MODE_BILEVEL_FIXED ) {
return QObject::tr("EPAP %1 IPAP %2 (%3)").arg(validPressure(settings_min(CPAP_EPAP))).arg(validPressure(settings_max(CPAP_IPAP))).arg(units); return QObject::tr("EPAP %1 IPAP %2 (%3)").arg(validPressure(settings_min(CPAP_EPAP))).
arg(validPressure(settings_max(CPAP_IPAP))).
arg(units);
} else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) { } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
return QObject::tr("PS %1 over %2-%3 (%4)").arg(validPressure(settings_max(CPAP_PS))).arg(validPressure(settings_min(CPAP_EPAPLo))).arg(validPressure(settings_max(CPAP_IPAPHi))).arg(units); return QObject::tr("PS %1 over %2-%3 (%4)").arg(validPressure(settings_max(CPAP_PS))).
arg(validPressure(settings_min(CPAP_EPAPLo))).
arg(validPressure(settings_max(CPAP_IPAPHi))).
arg(units);
} else if (mode == MODE_BILEVEL_AUTO_VARIABLE_PS) { } else if (mode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
return QObject::tr("Min EPAP %1 Max IPAP %2 PS %3-%4 (%5)").arg(validPressure(settings_min(CPAP_EPAPLo))). return QObject::tr("Min EPAP %1 Max IPAP %2 PS %3-%4 (%5)").arg(validPressure(settings_min(CPAP_EPAPLo))).
arg(validPressure(settings_max(CPAP_IPAPHi))). arg(validPressure(settings_max(CPAP_IPAPHi))).
@ -1606,11 +1616,25 @@ QString Day::getPressureSettings()
arg(validPressure(settings_min(CPAP_PSMax))). arg(validPressure(settings_min(CPAP_PSMax))).
arg(units); arg(units);
} else if (mode == MODE_AVAPS) { } else if (mode == MODE_AVAPS) {
return QObject::tr("EPAP %1 IPAP %2-%3 (%4)"). // qDebug() << "AVAPS: EPAP" << settings_min(CPAP_EPAP) << "IPAP min" << settings_max(CPAP_IPAPLo) <<
// "IPAP max" << settings_max(CPAP_IPAPHi);
QString retStr;
if (settings_min(CPAP_EPAPLo) == settings_max(CPAP_EPAPHi))
retStr = QObject::tr("EPAP %1 IPAP %2-%3 (%4)").
arg(validPressure(settings_min(CPAP_EPAP))). arg(validPressure(settings_min(CPAP_EPAP))).
arg(validPressure(settings_max(CPAP_IPAPLo))). arg(validPressure(settings_max(CPAP_IPAPLo))).
arg(validPressure(settings_max(CPAP_IPAPHi))). arg(validPressure(settings_max(CPAP_IPAPHi))).
arg(units); arg(units);
else
retStr = QObject::tr("EPAP %1-%2 IPAP %3-%4 (%5)").
arg(validPressure(settings_min(CPAP_EPAPLo))).
arg(validPressure(settings_min(CPAP_EPAPHi))).
arg(validPressure(settings_max(CPAP_IPAPLo))).
arg(validPressure(settings_max(CPAP_IPAPHi))).
arg(units);
// qDebug() << "AVAPS mode:" << retStr;
return retStr;
} }
return STR_TR_Unknown; return STR_TR_Unknown;

148
oscar/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -200,8 +200,8 @@ void ResmedLoader::initChannels()
channel.add(GRP_CPAP, chan = new Channel(RMAS1x_Comfort = 0xe20E, SETTING, MT_CPAP, SESSION, channel.add(GRP_CPAP, chan = new Channel(RMAS1x_Comfort = 0xe20E, SETTING, MT_CPAP, SESSION,
"RMAS1x_Comfort", QObject::tr("Response"), QObject::tr("Response"), QObject::tr("Response"), "", LOOKUP, Qt::black)); "RMAS1x_Comfort", QObject::tr("Response"), QObject::tr("Response"), QObject::tr("Response"), "", LOOKUP, Qt::black));
chan->addOption(0, QObject::tr("Soft")); // This must be verified chan->addOption(0, QObject::tr("Standard")); // This must be verified
chan->addOption(1, QObject::tr("Standard")); chan->addOption(1, QObject::tr("Soft"));
channel.add(GRP_CPAP, chan = new Channel(RMAS11_SmartStop = 0xe20F, SETTING, MT_CPAP, SESSION, channel.add(GRP_CPAP, chan = new Channel(RMAS11_SmartStop = 0xe20F, SETTING, MT_CPAP, SESSION,
"RMAS11_SmartStop", QObject::tr("SmartStop"), QObject::tr("Machine auto stops by breathing"), QObject::tr("Smart Stop"), "", LOOKUP, Qt::black)); "RMAS11_SmartStop", QObject::tr("SmartStop"), QObject::tr("Machine auto stops by breathing"), QObject::tr("Smart Stop"), "", LOOKUP, Qt::black));
@ -212,8 +212,8 @@ void ResmedLoader::initChannels()
channel.add(GRP_CPAP, chan = new Channel(RMAS11_PtView= 0xe210, SETTING, MT_CPAP, SESSION, channel.add(GRP_CPAP, chan = new Channel(RMAS11_PtView= 0xe210, SETTING, MT_CPAP, SESSION,
"RMAS11_PTView", QObject::tr("Patient View"), QObject::tr("Patient View"), QObject::tr("Patient View"), "", LOOKUP, Qt::black)); "RMAS11_PTView", QObject::tr("Patient View"), QObject::tr("Patient View"), QObject::tr("Patient View"), "", LOOKUP, Qt::black));
chan->addOption(0, QObject::tr("Simple")); chan->addOption(0, QObject::tr("Advanced"));
chan->addOption(1, QObject::tr("Advanced")); chan->addOption(1, QObject::tr("Simple"));
// Setup ResMeds signal name translation map // Setup ResMeds signal name translation map
setupResMedTranslationMap(); setupResMedTranslationMap();
@ -263,26 +263,14 @@ MachineInfo ResmedLoader::PeekInfo(const QString & path)
QFile f(path+"/"+RMS9_STR_idfile+"tgt"); QFile f(path+"/"+RMS9_STR_idfile+"tgt");
// Abort if this file is dodgy.. QFile j(path+"/"+RMS9_STR_idfile+"json"); // Check for AS11 file first, just in case
if (f.exists() ) { if (j.exists() ) { // somebody is reusing an SD card w/o re-formatting
if ( !f.open(QIODevice::ReadOnly)) {
return MachineInfo();
}
MachineInfo info = newInfo();
// Parse # entries into idmap.
while (!f.atEnd()) {
QString line = f.readLine().trimmed();
QHash<QString, QString> hash = parseIdentLine( line, & info );
}
return info;
}
QFile j(path+"/"+RMS9_STR_idfile+"json");
if (j.exists() ) {
if ( !j.open(QIODevice::ReadOnly)) { if ( !j.open(QIODevice::ReadOnly)) {
return MachineInfo(); return MachineInfo();
} }
if ( f.exists() ) {
qDebug() << "Old Ident.tgt file is ignored";
}
QByteArray identData = j.readAll(); QByteArray identData = j.readAll();
j.close(); j.close();
QJsonDocument identDoc(QJsonDocument::fromJson(identData)); QJsonDocument identDoc(QJsonDocument::fromJson(identData));
@ -301,6 +289,21 @@ MachineInfo ResmedLoader::PeekInfo(const QString & path)
} }
} }
// Abort if this file is dodgy..
if (f.exists() ) {
if ( !f.open(QIODevice::ReadOnly)) {
return MachineInfo();
}
MachineInfo info = newInfo();
// Parse # entries into idmap.
while (!f.atEnd()) {
QString line = f.readLine().trimmed();
QHash<QString, QString> hash = parseIdentLine( line, & info );
}
return info;
}
// neither filename exists, return empty info // neither filename exists, return empty info
return MachineInfo(); return MachineInfo();
} }
@ -1355,8 +1358,10 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
if ((sig = str.lookupSignal(CPAP_Mode))) { if ((sig = str.lookupSignal(CPAP_Mode))) {
int mod = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; int mod = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
R.rms9_mode = mod; R.rms9_mode = mod;
if ( AS_eleven && (mod == 2) )
R.rms9_mode = 11; //make it look like A4Her
if (mod == 11) { if ((mod == 11) && ( ! AS_eleven)) {
mode = MODE_APAP; // For her is a special apap mode = MODE_APAP; // For her is a special apap
} else if (mod == 9) { } else if (mod == 9) {
mode = MODE_AVAPS; mode = MODE_AVAPS;
@ -1369,6 +1374,11 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
} else if (mod >= 3) { // mod 3 == vpap s fixed pressure (EPAP, IPAP, No PS) } else if (mod >= 3) { // mod 3 == vpap s fixed pressure (EPAP, IPAP, No PS)
// 4,5 are S/T types... // 4,5 are S/T types...
mode = MODE_BILEVEL_FIXED; mode = MODE_BILEVEL_FIXED;
} else if (mod == 2) {
if ( AS_eleven )
mode = MODE_APAP;
else
mode = MODE_UNKNOWN;
} else if (mod == 1) { } else if (mod == 1) {
mode = MODE_APAP; // mod 1 == apap mode = MODE_APAP; // mod 1 == apap
// not sure what mode 2 is ?? split ? // not sure what mode 2 is ?? split ?
@ -1381,12 +1391,15 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
if ((mod == 0) && (sig = str.lookupLabel("S.C.StartPress"))) { if ((mod == 0) && (sig = str.lookupLabel("S.C.StartPress"))) {
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
// Settings.Adaptive Starting Pressure? // mode 11 = APAP for her? // Settings.Adaptive Starting Pressure?
if ( (mod == 1) && ((sig = str.lookupLabel("S.AS.StartPress")) || (sig = str.lookupLabel("S.A.StartPress"))) ) { if ( (mod == 1) && ((sig = str.lookupLabel("S.AS.StartPress")) || (sig = str.lookupLabel("S.A.StartPress"))) ) {
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
if ( (mod == 11) && (sig = str.lookupLabel("S.AFH.StartPress"))) { // mode 11 = APAP for her?
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; if ( ((mod == 11) && ( ! AS_eleven)) || ((mod == 2) && AS_eleven) ) {
if ( nullptr != (sig = str.lookupLabel("S.AFH.StartPress"))) {
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
} }
if ((R.mode == MODE_BILEVEL_FIXED) && (sig = str.lookupLabel("S.BL.StartPress"))) { if ((R.mode == MODE_BILEVEL_FIXED) && (sig = str.lookupLabel("S.BL.StartPress"))) {
// Bilevel Starting Pressure // Bilevel Starting Pressure
@ -1487,7 +1500,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
bool haveipap = false; bool haveipap = false;
Q_UNUSED( haveipap ); Q_UNUSED( haveipap );
// if (R.mode == MODE_BILEVEL_FIXED) {
if ((sig = str.lookupSignal(CPAP_IPAP))) { if ((sig = str.lookupSignal(CPAP_IPAP))) {
R.ipap = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.ipap = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
haveipap = true; haveipap = true;
@ -1495,10 +1508,39 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
if ((sig = str.lookupSignal(CPAP_EPAP))) { if ((sig = str.lookupSignal(CPAP_EPAP))) {
R.epap = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.epap = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
if (R.mode == MODE_AVAPS) {
if ((sig = str.lookupLabel("S.i.StartPress"))) {
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
if ((sig = str.lookupLabel("S.i.EPAP"))) {
R.min_epap = R.max_epap = R.epap = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
if ((sig = str.lookupLabel("S.i.MinPS"))) {
R.min_ps = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
if ((sig = str.lookupLabel("S.i.MinEPAP"))) {
R.min_epap = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
if ((sig = str.lookupLabel("S.i.MaxEPAP"))) {
R.max_epap = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
if ((sig = str.lookupLabel("S.i.MaxPS"))) {
R.max_ps = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
if ( (R.epap >= 0) && (R.max_epap == R.epap) ) {
R.max_ipap = R.epap + R.max_ps;
R.min_ipap = R.epap + R.min_ps;
} else {
R.max_ipap = R.max_epap + R.max_ps;
R.min_ipap = R.min_epap + R.min_ps;
}
// qDebug() << "AVAPS mode; Ramp" << R.ramp_pressure << "Min EPAP" << R.min_epap <<
// "Max EPAP" << R.max_epap << "Min PS" << R.min_ps << "Max PS" << R.max_ps <<
// "Min IPAP" << R.min_ipap << "Max_IPAP" << R.max_ipap;
}
if (R.mode == MODE_ASV) { if (R.mode == MODE_ASV) {
if ((sig = str.lookupLabel("S.AV.StartPress"))) { if ((sig = str.lookupLabel("S.AV.StartPress"))) {
EventDataType sp = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
R.ramp_pressure = sp;
} }
if ((sig = str.lookupLabel("S.AV.EPAP"))) { if ((sig = str.lookupLabel("S.AV.EPAP"))) {
R.min_epap = R.max_epap = R.epap = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.min_epap = R.max_epap = R.epap = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
@ -1675,6 +1717,8 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.s_RampEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_RampEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
if ( AS_eleven ) if ( AS_eleven )
R.s_RampEnable--; R.s_RampEnable--;
if ( R.s_RampEnable == 2 )
R.s_RampTime = -1;
} }
if ((sig = str.lookupLabel("S.EPR.ClinEnable"))) { if ((sig = str.lookupLabel("S.EPR.ClinEnable"))) {
R.s_EPR_ClinEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_EPR_ClinEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
@ -1701,8 +1745,12 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
if ((sig = str.lookupLabel("S.Mask"))) { if ((sig = str.lookupLabel("S.Mask"))) {
R.s_Mask = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_Mask = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
if ( AS_eleven ) if ( AS_eleven ) {
R.s_Mask--; if ( R.s_Mask < 2 || R.s_Mask > 4 )
R.s_Mask = 4; // unknown mask type
else
R.s_Mask -= 2; // why be consistent?
}
} }
if ((sig = str.lookupLabel("S.PtAccess"))) { if ((sig = str.lookupLabel("S.PtAccess"))) {
if ( AS_eleven ) { if ( AS_eleven ) {
@ -2235,20 +2283,21 @@ void StoreSettings(Session * sess, STRRecord & R)
if (R.min_ipap >= 0) sess->settings[CPAP_IPAPLo] = R.min_ipap; if (R.min_ipap >= 0) sess->settings[CPAP_IPAPLo] = R.min_ipap;
if (R.min_ps >= 0) sess->settings[CPAP_PSMin] = R.min_ps; if (R.min_ps >= 0) sess->settings[CPAP_PSMin] = R.min_ps;
if (R.max_ps >= 0) sess->settings[CPAP_PSMax] = R.max_ps; if (R.max_ps >= 0) sess->settings[CPAP_PSMax] = R.max_ps;
} else {
// qDebug() << "Setting session pressures for random mode";
if (R.set_pressure >= 0) sess->settings[CPAP_Pressure] = R.set_pressure;
if (R.min_pressure >= 0) sess->settings[CPAP_PressureMin] = R.min_pressure;
if (R.max_pressure >= 0) sess->settings[CPAP_PressureMax] = R.max_pressure;
if (R.max_epap >= 0) sess->settings[CPAP_EPAPHi] = R.max_epap;
if (R.min_epap >= 0) sess->settings[CPAP_EPAPLo] = R.min_epap;
if (R.max_ipap >= 0) sess->settings[CPAP_IPAPHi] = R.max_ipap;
if (R.min_ipap >= 0) sess->settings[CPAP_IPAPLo] = R.min_ipap;
if (R.min_ps >= 0) sess->settings[CPAP_PSMin] = R.min_ps;
if (R.max_ps >= 0) sess->settings[CPAP_PSMax] = R.max_ps;
if (R.ps >= 0) sess->settings[CPAP_PS] = R.ps;
if (R.epap >= 0) sess->settings[CPAP_EPAP] = R.epap;
if (R.ipap >= 0) sess->settings[CPAP_IPAP] = R.ipap;
} }
} else {
if (R.set_pressure >= 0) sess->settings[CPAP_Pressure] = R.set_pressure;
if (R.min_pressure >= 0) sess->settings[CPAP_PressureMin] = R.min_pressure;
if (R.max_pressure >= 0) sess->settings[CPAP_PressureMax] = R.max_pressure;
if (R.max_epap >= 0) sess->settings[CPAP_EPAPHi] = R.max_epap;
if (R.min_epap >= 0) sess->settings[CPAP_EPAPLo] = R.min_epap;
if (R.max_ipap >= 0) sess->settings[CPAP_IPAPHi] = R.max_ipap;
if (R.min_ipap >= 0) sess->settings[CPAP_IPAPLo] = R.min_ipap;
if (R.min_ps >= 0) sess->settings[CPAP_PSMin] = R.min_ps;
if (R.max_ps >= 0) sess->settings[CPAP_PSMax] = R.max_ps;
if (R.ps >= 0) sess->settings[CPAP_PS] = R.ps;
if (R.epap >= 0) sess->settings[CPAP_EPAP] = R.epap;
if (R.ipap >= 0) sess->settings[CPAP_IPAP] = R.ipap;
} }
if (R.epr >= 0) { if (R.epr >= 0) {
@ -2839,6 +2888,8 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
CA = sess->AddEventList(CPAP_ClearAirway, EVL_Event); CA = sess->AddEventList(CPAP_ClearAirway, EVL_Event);
if (sess->checkInside(tt)) if (sess->checkInside(tt))
CA->AddEvent(tt, anno->duration); CA->AddEvent(tt, anno->duration);
} else if (anno->text == "SpO2 Desaturation") { // Used in 28509
continue; // ignored for now
} else { } else {
if (anno->text != "Recording starts") { if (anno->text != "Recording starts") {
qDebug() << "Unobserved ResMed annotation field: " << anno->text; qDebug() << "Unobserved ResMed annotation field: " << anno->text;
@ -3048,7 +3099,7 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
time.start(); time.start();
#endif #endif
QString filename = path.section(-2, -1); QString filename = path.section(-2, -1);
qDebug() << "LoadPLD opening" << filename.section("/", -2, -1); // qDebug() << "LoadPLD opening" << filename.section("/", -2, -1);
ResMedEDFInfo edf; ResMedEDFInfo edf;
if ( ! edf.Open(path) ) { if ( ! edf.Open(path) ) {
qDebug() << "LoadPLD failed to open" << filename.section("/", -2, -1); qDebug() << "LoadPLD failed to open" << filename.section("/", -2, -1);
@ -3198,6 +3249,12 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
// a = ToTimeDelta(sess,edf,es, code,samples,duration,0,0, square); // a = ToTimeDelta(sess,edf,es, code,samples,duration,0,0, square);
} else if (es.label == "Va") { // Signal used in 36039... What to do with it??? } else if (es.label == "Va") { // Signal used in 36039... What to do with it???
a = nullptr; // We'll skip it for now a = nullptr; // We'll skip it for now
} else if (es.label == "AlvMinVent.2s") { // Signal used in 28509... What to do with it???
a = nullptr; // We'll skip it for now
} else if (es.label == "CLRatio.2s") { // Signal used in 28509... What to do with it???
a = nullptr; // We'll skip it for now
} else if (es.label == "TRRatio.2s") { // Signal used in 28509... What to do with it???
a = nullptr; // We'll skip it for now
} else if (es.label == "") { // What the hell resmed?? } else if (es.label == "") { // What the hell resmed??
// these empty lables should be changed in resmed_EDFInfo to something unique // these empty lables should be changed in resmed_EDFInfo to something unique
if (emptycnt == 0) { if (emptycnt == 0) {
@ -3408,7 +3465,8 @@ EventList * buildEventList( EventStoreType est, EventDataType t_min, EventDataTy
el->AddEvent(tt, est); el->AddEvent(tt, est);
} else { } else {
qDebug() << "Value:" << tmp << "Out of range: t_min:" << t_min << "t_max:" << t_max << "EL count:" << el->count(); if ( tmp > 0 )
qDebug() << "Value:" << tmp << "Out of range: t_min:" << t_min << "t_max:" << t_max << "EL count:" << el->count();
// Out of bounds value, start a new eventlist // Out of bounds value, start a new eventlist
// But first drop a closing value that repeats the last one // But first drop a closing value that repeats the last one
el->AddEvent(tt, el->raw(el->count() - 1)); el->AddEvent(tt, el->raw(el->count() - 1));

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);
} }

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

@ -225,6 +225,10 @@ int SleepStyleLoader::OpenMachine(Machine *mach, const QString & path, const QSt
backupData(mach, path); backupData(mach, path);
calc_leaks = p_profile->cpap->calculateUnintentionalLeaks();
lpm4 = p_profile->cpap->custom4cmH2OLeaks();
lpm20 = p_profile->cpap->custom20cmH2OLeaks();
qDebug() << "Opening F&P SleepStyle" << ssPath; qDebug() << "Opening F&P SleepStyle" << ssPath;
dir.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks); dir.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks);
@ -451,23 +455,32 @@ bool SleepStyleLoader::OpenRealTime(Machine *mach, const QString & fname, const
sess->really_set_first(edf.startdate); sess->really_set_first(edf.startdate);
qint64 duration = edf.GetNumDataRecords() * edf.GetDurationMillis(); qint64 duration = edf.GetNumDataRecords() * edf.GetDurationMillis();
qDebug() << "SS EDF millis" << edf.GetDurationMillis() << "num recs" << edf.GetNumDataRecords();
sess->updateLast(edf.startdate + duration); sess->updateLast(edf.startdate + duration);
// Find the leak signal and data // Find the leak signal and data
long leakrecs = 0; long leakrecs = 0;
EDFSignal leakSignal; EDFSignal leakSignal;
EDFSignal maskSignal;
long maskRecs;
for (auto & esleak : edf.edfsignals) { for (auto & esleak : edf.edfsignals) {
leakrecs = esleak.sampleCnt * edf.GetNumDataRecords(); leakrecs = esleak.sampleCnt * edf.GetNumDataRecords();
if (leakrecs < 0) if (leakrecs < 0)
continue; continue;
if (esleak.label == "Leak") { if (esleak.label == "Leak") {
leakSignal = esleak; leakSignal = esleak;
break;
} }
} }
// Walk through all signals, ignoring leaks // Walk through all signals, ignoring leaks
for (auto & es : edf.edfsignals) { for (auto & es : edf.edfsignals) {
long recs = es.sampleCnt * edf.GetNumDataRecords(); long recs = es.sampleCnt * edf.GetNumDataRecords();
#ifdef DEBUGSS
qDebug() << "SS EDF" << es.label << "count" << es.sampleCnt << "gain" << es.gain << "offset" << es.offset
<< "dim" << es.physical_dimension << "phys min" << es.physical_minimum << "max" << es.physical_maximum
<< "dig min" << es.digital_minimum << "max" << es.digital_maximum;
#endif
if (recs < 0) if (recs < 0)
continue; continue;
ChannelID code = 0; ChannelID code = 0;
@ -491,8 +504,66 @@ bool SleepStyleLoader::OpenRealTime(Machine *mach, const QString & fname, const
} }
} else if (es.label == "Pressure") { } else if (es.label == "Pressure") {
// First compute CPAP_Leak data
maskRecs = es.sampleCnt * edf.GetNumDataRecords();
maskSignal = es;
float lpm = lpm20 - lpm4;
float ppm = lpm / 16.0;
if (maskRecs != leakrecs) {
qWarning() << "SS ORT maskRecs" << maskRecs << "!= leakrecs" << leakrecs;
} else {
qint16 * leakarray = new qint16 [maskRecs];
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 several adjacent data points to make best guess at IPAP
float mp = es.dataArray[i];
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
// Calculate expected (intentional) leak in l/m
float expLeak = press * ppm + lpm4;
qint16 unintLeak = leakSignal.dataArray[i] - (qint16)(expLeak / es.gain);
if (unintLeak < 0)
unintLeak = 0;
leakarray[i] = unintLeak;
}
ChannelID leakcode = CPAP_Leak;
double rate = double(duration) / double(recs);
EventList *a = sess->AddEventList(leakcode, EVL_Waveform, es.gain, es.offset, 0, 0, rate);
a->setDimension(es.physical_dimension);
a->AddWaveform(edf.startdate, leakarray, recs, duration);
EventDataType min = a->Min();
EventDataType max = a->Max();
/***
// Cap to physical dimensions, because there can be ram glitches/whatever that throw really big outliers.
if (min < es.physical_minimum)
min = es.physical_minimum;
if (max > es.physical_maximum)
max = es.physical_maximum;
***/
sess->updateMin(leakcode, min);
sess->updateMax(leakcode, max);
sess->setPhysMin(leakcode, es.physical_minimum);
sess->setPhysMax(leakcode, es.physical_maximum);
delete [] leakarray;
}
// Now do normal processing for Mask Pressure
code = CPAP_MaskPressure; code = CPAP_MaskPressure;
} else if (es.label == "Leak") {
code = CPAP_LeakTotal;
} else } else
continue; continue;
@ -501,7 +572,9 @@ bool SleepStyleLoader::OpenRealTime(Machine *mach, const QString & fname, const
EventList *a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate); EventList *a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate);
a->setDimension(es.physical_dimension); a->setDimension(es.physical_dimension);
a->AddWaveform(edf.startdate, es.dataArray, recs, duration); a->AddWaveform(edf.startdate, es.dataArray, recs, duration);
#ifdef DEBUGSS
qDebug() << "SS EDF recs" << recs << "duration" << duration << "rate" << rate;
#endif
EventDataType min = a->Min(); EventDataType min = a->Min();
EventDataType max = a->Max(); EventDataType max = a->Max();
@ -826,6 +899,7 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)
qint64 ti; qint64 ti;
quint8 pressure, leak, a1, a2, a3, a4, a5, a6; quint8 pressure, leak, a1, a2, a3, a4, a5, a6;
Q_UNUSED(leak)
// quint8 sa1, sa2; // The two sense awake bits per 2 minutes // quint8 sa1, sa2; // The two sense awake bits per 2 minutes
SessionID sessid; SessionID sessid;
Session *sess; Session *sess;
@ -836,8 +910,9 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)
sess = Sessions[sessid]; sess = Sessions[sessid];
ti = qint64(sessid) * 1000L; ti = qint64(sessid) * 1000L;
sess->really_set_first(ti); sess->really_set_first(ti);
long PRSessCount = 0;
EventList *LK = sess->AddEventList(CPAP_LeakTotal, EVL_Event, 1); //fastleak EventList *LK = sess->AddEventList(CPAP_LeakTotal, EVL_Event, 1);
EventList *PR = sess->AddEventList(CPAP_Pressure, EVL_Event, 0.1F); EventList *PR = sess->AddEventList(CPAP_Pressure, EVL_Event, 0.1F);
EventList *A = sess->AddEventList(CPAP_AllApnea, EVL_Event); EventList *A = sess->AddEventList(CPAP_AllApnea, EVL_Event);
EventList *H = sess->AddEventList(CPAP_Hypopnea, EVL_Event); EventList *H = sess->AddEventList(CPAP_Hypopnea, EVL_Event);
@ -859,10 +934,14 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)
for (int j = 0; j < 3; ++j) { for (int j = 0; j < 3; ++j) {
pressure = data[idx]; pressure = data[idx];
PR->AddEvent(ti+120000, pressure); PR->AddEvent(ti+120000, pressure);
PRSessCount++;
#ifdef DEBUGSS
leak = data[idx + 1]; leak = data[idx + 1];
#endif
/* fastleak
LK->AddEvent(ti+120000, leak); LK->AddEvent(ti+120000, leak);
*/
// Comments below from MW. Appear not to be accurate // Comments below from MW. Appear not to be accurate
a1 = data[idx + 2]; // [0..5] Obstructive flag, [6..7] Unknown a1 = data[idx + 2]; // [0..5] Obstructive flag, [6..7] Unknown
a2 = data[idx + 3]; // [0..5] Hypopnea, [6..7] Unknown a2 = data[idx + 3]; // [0..5] Hypopnea, [6..7] Unknown
@ -904,6 +983,9 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)
} }
} }
#ifdef DEBUGSS
qDebug() << "SS DET pressure events" << PR->count() << "prSessVount" << PRSessCount << "beginning" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("MM/dd/yyyy hh:mm:ss");
#endif
// Update indexes, process waveform and perform flagging // Update indexes, process waveform and perform flagging
sess->setSummaryOnly(false); sess->setSummaryOnly(false);
sess->UpdateSummaries(); sess->UpdateSummaries();

2
oscar/SleepLib/loader_plugins/sleepstyle_loader.h
View File

@ -112,6 +112,8 @@ class SleepStyleLoader : public CPAPLoader
// QString serial; // Serial number // QString serial; // Serial number
bool rebuild_from_backups = false; bool rebuild_from_backups = false;
bool create_backups = true; bool create_backups = true;
bool calc_leaks = true;
float lpm4, lpm20; // Leak per minute at 4 and 20 cmH20
unsigned char *m_buffer; unsigned char *m_buffer;
}; };

130
oscar/SleepLib/loader_plugins/viatom_loader.cpp
View File

@ -2,7 +2,6 @@
* *
* Copyright (c) 2019-2020 The OSCAR Team * Copyright (c) 2019-2020 The OSCAR Team
* (Initial importer written by dave madden <dhm@mersenne.com>) * (Initial importer written by dave madden <dhm@mersenne.com>)
* Modified 02/21/2021 to allow for CheckMe device data files by Crimson Nape <CrimsonNape@gmail.com>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
@ -23,6 +22,16 @@
#include "viatom_loader.h" #include "viatom_loader.h"
#include "SleepLib/machine.h" #include "SleepLib/machine.h"
// TODO: Merge this with PRS1 macros and generalize for all loaders.
#define SESSIONID m_session->session()
#define UNEXPECTED_VALUE(SRC, VALS) { \
QString message = QString("%1:%2: %3 = %4 != %5").arg(__func__).arg(__LINE__).arg(#SRC).arg(SRC).arg(VALS); \
qWarning() << SESSIONID << message; \
s_unexpectedMessages += message; \
}
#define CHECK_VALUE(SRC, VAL) if ((SRC) != (VAL)) UNEXPECTED_VALUE(SRC, VAL)
#define CHECK_VALUES(SRC, VAL1, VAL2) if ((SRC) != (VAL1) && (SRC) != (VAL2)) UNEXPECTED_VALUE(SRC, #VAL1 " or " #VAL2)
// for more than 2 values, just write the test manually and use UNEXPECTED_VALUE if it fails
static QSet<QString> s_unexpectedMessages; static QSet<QString> s_unexpectedMessages;
bool bool
@ -158,8 +167,27 @@ Session* ViatomLoader::ParseFile(const QString & filename, bool *existing)
EndEventList(OXI_Pulse, time_ms); EndEventList(OXI_Pulse, time_ms);
EndEventList(OXI_SPO2, time_ms); EndEventList(OXI_SPO2, time_ms);
} else { } else {
// Viatom advertises a range of 30 - 250 bpm.
if (rec.hr < 30 || rec.hr > 250) {
UNEXPECTED_VALUE(rec.hr, "30-250");
}
AddEvent(OXI_Pulse, time_ms, rec.hr); AddEvent(OXI_Pulse, time_ms, rec.hr);
AddEvent(OXI_SPO2, time_ms, rec.spo2);
if (rec.spo2 == 0xFF) {
// When the readings fall below 61%, Viatom devices record 0xFF for SpO2.
// The official software discards these readings.
// TODO: Consider whether to import these as 60% since they reflect hypoxia.
EndEventList(OXI_SPO2, time_ms);
//qDebug() << "<61% at" << QDateTime::fromMSecsSinceEpoch(time_ms);
} else {
// Viatom advertises (and graphs) a range of 70% - 99%, but apparently records down to 61%.
// The official software graphs 61%-70% as 70%.
// TODO: Consider whether we should import 61%-70% as 70% to match the official reports.
if (rec.spo2 < 61 || rec.spo2 > 99) {
UNEXPECTED_VALUE(rec.spo2, "61-99%");
}
AddEvent(OXI_SPO2, time_ms, rec.spo2);
}
} }
AddEvent(POS_Movement, time_ms, rec.motion); AddEvent(POS_Movement, time_ms, rec.motion);
time_ms += m_step; time_ms += m_step;
@ -208,7 +236,12 @@ void ViatomLoader::EndEventList(ChannelID channel, qint64 /*t*/)
QStringList ViatomLoader::getNameFilter() QStringList ViatomLoader::getNameFilter()
{ {
return QStringList("20[0-5][0-9][01][0-9][0-3][0-9][012][0-9][0-5][0-9][0-5][0-9]"); // Sometimes the files have a SleepU_ or O2Ring_ prefix.
// Sometimes they have punctuation in the timestamp.
// Note that ":" is not allowed on macOS, so Mac users will need to rename their files in order to select and import them.
return QStringList({"*20[0-5][0-9][01][0-9][0-3][0-9][012][0-9][0-5][0-9][0-5][0-9]",
"*20[0-5][0-9]-[01][0-9]-[0-3][0-9] [012][0-9]:[0-5][0-9]:[0-5][0-9]"
});
} }
static bool viatom_initialized = false; static bool viatom_initialized = false;
@ -227,35 +260,8 @@ ViatomLoader::Register()
// =============================================================================================== // ===============================================================================================
/* #undef SESSIONID
static QString ts(qint64 msecs) #define SESSIONID this->m_sessionid
{
// TODO: make this UTC so that tests don't vary by where they're run
return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate);
}
static QString dur(qint64 msecs)
{
qint64 s = msecs / 1000L;
int h = s / 3600; s -= h * 3600;
int m = s / 60; s -= m * 60;
return QString("%1:%2:%3")
.arg(h, 2, 10, QChar('0'))
.arg(m, 2, 10, QChar('0'))
.arg(s, 2, 10, QChar('0'));
}
*/
// TODO: Merge this with PRS1 macros and generalize for all loaders.
#define UNEXPECTED_VALUE(SRC, VALS) { \
QString message = QString("%1:%2: %3 = %4 != %5").arg(__func__).arg(__LINE__).arg(#SRC).arg(SRC).arg(VALS); \
qWarning() << this->m_sessionid << message; \
s_unexpectedMessages += message; \
}
#define CHECK_VALUE(SRC, VAL) if ((SRC) != (VAL)) UNEXPECTED_VALUE(SRC, VAL)
#define CHECK_VALUES(SRC, VAL1, VAL2) if ((SRC) != (VAL1) && (SRC) != (VAL2)) UNEXPECTED_VALUE(SRC, #VAL1 " or " #VAL2)
// for more than 2 values, just write the test manually and use UNEXPECTED_VALUE if it fails
ViatomFile::ViatomFile(QFile & file) : m_file(file) ViatomFile::ViatomFile(QFile & file) : m_file(file)
{ {
@ -279,14 +285,7 @@ bool ViatomFile::ParseHeader()
int min = header[7]; int min = header[7];
int sec = header[8]; int sec = header[8];
switch (sig) {
/* CN - Changed the if statement to a switch to accomdate additional Viatom/Wellue signatures in the future
if (sig != 0x0003) {
qDebug() << m_file.fileName() << "invalid signature for Viatom data file" << sig;
return false;
}
CN */
switch (sig){
case 0x0003: case 0x0003:
case 0x0005: case 0x0005:
break; break;
@ -295,6 +294,7 @@ bool ViatomFile::ParseHeader()
return false; return false;
break; break;
} }
CHECK_VALUE(sig, 3); // We have only a single sample of 5, without a corresponding PDF. We need more samples.
if ((year < 2015 || year > 2059) || (month < 1 || month > 12) || (day < 1 || day > 31) || if ((year < 2015 || year > 2059) || (month < 1 || month > 12) || (day < 1 || day > 31) ||
(hour > 23) || (min > 59) || (sec > 59)) { (hour > 23) || (min > 59) || (sec > 59)) {
@ -311,6 +311,24 @@ bool ViatomFile::ParseHeader()
// starting timestamp). Technically these should probably be square charts, but // starting timestamp). Technically these should probably be square charts, but
// the code currently forces them to be non-square. // the code currently forces them to be non-square.
QDateTime data_timestamp = QDateTime(QDate(year, month, day), QTime(hour, min, sec)); QDateTime data_timestamp = QDateTime(QDate(year, month, day), QTime(hour, min, sec));
QString date_string = QFileInfo(m_file).fileName().section("_", -1); // Strip any SleepU_ etc. prefix.
QString format_string = "yyyyMMddHHmmss";
if (date_string.contains(":")) {
format_string = "yyyy-MM-dd HH:mm:ss";
}
QDateTime filename_timestamp = QDateTime::fromString(date_string, format_string);
if (filename_timestamp.isValid()) {
if (filename_timestamp != data_timestamp) {
// TODO: Once there's a better/easier way to adjust session times within OSCAR, we can remove the below.
qDebug() << m_file.fileName() << "Using filename timestamp" << filename_timestamp.toString("yyyy-MM-dd HH:mm:ss")
<< "instead of header timestamp" << data_timestamp.toString("yyyy-MM-dd HH:mm:ss");
data_timestamp = filename_timestamp;
}
} else {
qWarning() << m_file.fileName() << "invalid timestamp in Viatom filename";
}
m_timestamp = data_timestamp.toMSecsSinceEpoch(); m_timestamp = data_timestamp.toMSecsSinceEpoch();
m_sessionid = m_timestamp / 1000L; m_sessionid = m_timestamp / 1000L;
@ -330,11 +348,11 @@ bool ViatomFile::ParseHeader()
//int time_under_90pct = header[22] | (header[23] << 8); // in seconds //int time_under_90pct = header[22] | (header[23] << 8); // in seconds
//int events_under_90pct = header[24]; // number of distinct events //int events_under_90pct = header[24]; // number of distinct events
//float o2_score = header[25] * 0.1; //float o2_score = header[25] * 0.1;
CHECK_VALUE(header[26], 0); //CHECK_VALUES(header[26], 0, 4); // number of steps taken (when nonzero, only reported by some models)
CHECK_VALUE(header[27], 0); CHECK_VALUE(header[27], 0);
CHECK_VALUE(header[28], 0); CHECK_VALUE(header[28], 0);
CHECK_VALUE(header[29], 0); CHECK_VALUE(header[29], 0);
CHECK_VALUE(header[30], 0); //CHECK_VALUE(header[30], 0); // average pulse rate (when nonzero)
CHECK_VALUE(header[31], 0); CHECK_VALUE(header[31], 0);
CHECK_VALUE(header[32], 0); CHECK_VALUE(header[32], 0);
CHECK_VALUE(header[33], 0); CHECK_VALUE(header[33], 0);
@ -360,8 +378,10 @@ bool ViatomFile::ParseHeader()
CHECK_VALUE(filesize, m_file.size()); CHECK_VALUE(filesize, m_file.size());
} }
CHECK_VALUES(m_resolution, 2000, 4000); CHECK_VALUES(m_resolution, 2000, 4000);
// CHECK_VALUE(datasize % RECORD_SIZE, 0); CN - Commented out these 2 lines because CheckMe can record odd number of entries if (true) { // TODO: We need CheckMe sample data where this doesn't hold true.
// CHECK_VALUE(m_duration % m_record_count, 0); CHECK_VALUE(datasize % RECORD_SIZE, 0);
CHECK_VALUE(m_duration % m_record_count, 0);
}
//qDebug().noquote() << m_file.fileName() << ts(m_timestamp) << dur(m_duration * 1000L) << ":" << m_record_count << "records @" << m_resolution << "ms"; //qDebug().noquote() << m_file.fileName() << ts(m_timestamp) << dur(m_duration * 1000L) << ":" << m_record_count << "records @" << m_resolution << "ms";
@ -373,22 +393,25 @@ QList<ViatomFile::Record> ViatomFile::ReadData()
QByteArray data = m_file.readAll(); QByteArray data = m_file.readAll();
QDataStream in(data); QDataStream in(data);
in.setByteOrder(QDataStream::LittleEndian); in.setByteOrder(QDataStream::LittleEndian);
int iCheckMeAdj; // Allows for an odd number in the CheckMe duration/# of records return
QList<ViatomFile::Record> records; QList<ViatomFile::Record> records;
// Read all Pulse, SPO2 and Motion data // Read all Pulse, SPO2 and Motion data
do { do {
ViatomFile::Record rec; ViatomFile::Record rec;
in >> rec.spo2 >> rec.hr >> rec.oximetry_invalid >> rec.motion >> rec.vibration; in >> rec.spo2 >> rec.hr >> rec.oximetry_invalid >> rec.motion >> rec.vibration;
CHECK_VALUES(rec.oximetry_invalid, 0, 0xFF); //If it doesn't have one of these 2 values, it's bad CHECK_VALUES(rec.oximetry_invalid, 0, 0xFF);
if (rec.vibration == 0x40) rec.vibration = 0x80; //0x040 (64) or 0x80 (128) when vibration is triggered if (rec.vibration) {
CHECK_VALUES(rec.vibration, 0, 0x80); // 0x80 (128) when vibration is triggered CHECK_VALUES(rec.vibration, 0x40, 0x80); // 0x40 or 0x80 when vibration is triggered
}
// Invalid readings indicate any interruption in the measurements, whether
// transitory (e.g. due to movement) or when the device is removed at the end of a session.
if (rec.oximetry_invalid == 0xFF) { if (rec.oximetry_invalid == 0xFF) {
CHECK_VALUE(rec.spo2, 0xFF); CHECK_VALUE(rec.spo2, 0xFF);
CHECK_VALUE(rec.hr, 0xFF); // if all 3 have 0xFF, then end of data CHECK_VALUE(rec.hr, 0xFF);
} }
records.append(rec); records.append(rec);
} while (records.size() < m_record_count); // CN Changed to allow for an incomlpete record values } while (records.size() < m_record_count);
// CN } while (!in.atEnd());
// It turns out 2s files are actually just double-reported samples! // It turns out 2s files are actually just double-reported samples!
if (m_resolution == 2000) { if (m_resolution == 2000) {
@ -415,11 +438,14 @@ QList<ViatomFile::Record> ViatomFile::ReadData()
records = dedup; records = dedup;
} }
} }
/* TODO: Test against CheckMe sample data
int iCheckMeAdj; // Allows for an odd number in the CheckMe duration/# of records return
iCheckMeAdj = duration() / records.size(); iCheckMeAdj = duration() / records.size();
if(iCheckMeAdj == 3) iCheckMeAdj = 4; // CN - Sanity check for CheckMe devices since their files do not always terminate on an even number. if(iCheckMeAdj == 3) iCheckMeAdj = 4; // CN - Sanity check for CheckMe devices since their files do not always terminate on an even number.
CHECK_VALUE(iCheckMeAdj, 4); // Crimson Nape - Changed to accomadate the CheckMe data files. CHECK_VALUE(iCheckMeAdj, 4); // Crimson Nape - Changed to accomadate the CheckMe data files.
// CHECK_VALUE(duration() / records.size(), 4); // We've only seen 4s true resolution so far. */
CHECK_VALUE(duration() / records.size(), 4); // We've only seen 4s true resolution so far.
return records; return records;
} }

1
oscar/SleepLib/loader_plugins/viatom_loader.h
View File

@ -2,7 +2,6 @@
* *
* Copyright (c) 2019-2020 The OSCAR Team * Copyright (c) 2019-2020 The OSCAR Team
* (Initial importer written by dave madden <dhm@mersenne.com>) * (Initial importer written by dave madden <dhm@mersenne.com>)
* Modified 02/21/2021 to allow for CheckMe device data files by Crimson Nape <CrimsonNape@gmail.com>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code

2
oscar/VERSION
View File

@ -1,4 +1,4 @@
// Update the string below to set OSCAR's version and release status. // Update the string below to set OSCAR's version and release status.
// See https://semver.org/spec/v2.0.0.html for details on format. // See https://semver.org/spec/v2.0.0.html for details on format.
#define VERSION "1.3.0-beta.2" #define VERSION "1.3.0-beta.3"

22
oscar/checkupdates.cpp
View File

@ -162,25 +162,30 @@ void CheckUpdates::compareVersions () {
VersionInfo testVersion = getVersionInfo ("test", platformStr()); VersionInfo testVersion = getVersionInfo ("test", platformStr());
msg = ""; msg = "";
if (!showTestVersion)
testVersion.version = "";
if (testVersion.version.length() == 0 && releaseVersion.version.length() == 0) { if (testVersion.version.length() == 0 && releaseVersion.version.length() == 0) {
if (showIfCurrent) if (showIfCurrent) {
msg = QObject::tr("You are running the latest release of OSCAR"); QString txt = getVersion().IsReleaseVersion()?QObject::tr("release"):QObject::tr("test version");
QString txt2 = QObject::tr("You are running the latest %1 of OSCAR").arg(txt);
msg = txt2 + "<p>" + QObject::tr("You are running OSCAR %1").arg(getVersion()) + "</p>";
}
} else { } else {
msg = QObject::tr("A more recent version of OSCAR is available"); msg = QObject::tr("A more recent version of OSCAR is available");
msg += "<p>" + QObject::tr("You are running version %1").arg(getVersion()) + "</p>"; msg += "<p>" + QObject::tr("You are running OSCAR %1").arg(getVersion()) + "</p>";
if (releaseVersion.version.length() > 0) { if (releaseVersion.version.length() > 0) {
msg += "<p>" + QObject::tr("OSCAR %1 is available <a href='%2'>here</a>.").arg(releaseVersion.version).arg(releaseVersion.urlInstaller) + "</p>"; msg += "<p>" + QObject::tr("OSCAR %1 is available <a href='%2'>here</a>.").arg(releaseVersion.version).arg(releaseVersion.urlInstaller) + "</p>";
} }
if (testVersion.version.length() > 0) { if (showTestVersion && (testVersion.version.length() > 0)) {
msg += "<p>" + QObject::tr("Information about more recent test version %1 is available at <a href='%2'>%2</a>").arg(testVersion.version).arg(testVersion.urlInstaller) + "</p>"; msg += "<p>" + QObject::tr("Information about more recent test version %1 is available at <a href='%2'>%2</a>").arg(testVersion.version).arg(testVersion.urlInstaller) + "</p>";
} }
} }
if (msg.length() > 0) { if (msg.length() > 0) {
// Add elapsed time in test versions only // Add elapsed time in test versions only
if (elapsedTime > 0 && !getVersion().IsReleaseVersion()) // if (elapsedTime > 0 && !getVersion().IsReleaseVersion())
msg += "<font size='-1'><p>" + QString(QObject::tr("(Reading %1 took %2 seconds)")).arg("versions.xml").arg(elapsedTime) + "</p></font>"; // msg += "<font size='-1'><p>" + QString(QObject::tr("(Reading %1 took %2 seconds)")).arg("versions.xml").arg(elapsedTime) + "</p></font>";
msgIsReady = true; msgIsReady = true;
} }
@ -212,9 +217,12 @@ void CheckUpdates::showMessage()
void CheckUpdates::checkForUpdates(bool showWhenCurrent) void CheckUpdates::checkForUpdates(bool showWhenCurrent)
{ {
showIfCurrent = showWhenCurrent; showIfCurrent = showWhenCurrent;
showTestVersion = false;
// If running a test version of OSCAR, try reading versions.xml from OSCAR_Data directory // If running a test version of OSCAR, try reading versions.xml from OSCAR_Data directory
// and force display of any new test version
if (!getVersion().IsReleaseVersion()) { if (!getVersion().IsReleaseVersion()) {
showTestVersion = true;
versionXML = readLocalVersions(); versionXML = readLocalVersions();
if (versionXML.length() > 0) { if (versionXML.length() > 0) {
compareVersions(); compareVersions();
@ -223,6 +231,8 @@ void CheckUpdates::checkForUpdates(bool showWhenCurrent)
showMessage(); showMessage();
return; return;
} }
} else {
showTestVersion = AppSetting->allowEarlyUpdates();
} }
readTimer.start(); readTimer.start();

1
oscar/checkupdates.h
View File

@ -50,6 +50,7 @@ class CheckUpdates : public QMainWindow
QString msg; // Message to show to user QString msg; // Message to show to user
bool msgIsReady = false; // Message is ready to be displayed bool msgIsReady = false; // Message is ready to be displayed
bool showIfCurrent = false; // show a message if running current release bool showIfCurrent = false; // show a message if running current release
bool showTestVersion = false; // Show message if test version is available
QProgressDialog * checkingBox;// Looking for updates message QProgressDialog * checkingBox;// Looking for updates message
QNetworkReply *reply; QNetworkReply *reply;

2
oscar/daily.cpp
View File

@ -2474,6 +2474,7 @@ void Daily::on_ZombieMeter_valueChanged(int action)
} }
journal->settings[Journal_ZombieMeter]=ui->ZombieMeter->value(); journal->settings[Journal_ZombieMeter]=ui->ZombieMeter->value();
journal->SetChanged(true); journal->SetChanged(true);
mainwin->updateOverview();
} }
void Daily::on_bookmarkTable_itemChanged(QTableWidgetItem *item) void Daily::on_bookmarkTable_itemChanged(QTableWidgetItem *item)
@ -2552,6 +2553,7 @@ void Daily::on_weightSpinBox_editingFinished()
if (g) g->setDay(nullptr); if (g) g->setDay(nullptr);
} }
journal->SetChanged(true); journal->SetChanged(true);
mainwin->updateOverview();
} }
void Daily::on_ouncesSpinBox_valueChanged(int arg1) void Daily::on_ouncesSpinBox_valueChanged(int arg1)

27
oscar/mainwindow.cpp
View File

@ -746,6 +746,11 @@ int MainWindow::importCPAP(ImportPath import, const QString &message)
return c; return c;
} }
void MainWindow::updateOverview()
{
if (overview)
overview->ReloadGraphs();
}
void MainWindow::finishCPAPImport() void MainWindow::finishCPAPImport()
{ {
if (daily) if (daily)
@ -2712,8 +2717,28 @@ void MainWindow::on_actionCreate_Card_zip_triggered()
bool ok = z.Open(filename); bool ok = z.Open(filename);
if (ok) { if (ok) {
ProgressDialog * prog = new ProgressDialog(this); ProgressDialog * prog = new ProgressDialog(this);
// Very full cards can sometimes take nearly a minute to scan,
// so display the progress dialog immediately.
prog->setMessage(tr("Calculating size..."));
prog->setWindowModality(Qt::ApplicationModal);
prog->open();
// Build the list of files.
FileQueue files;
bool ok = files.AddDirectory(cardPath, prefix);
// If there were any unexpected errors scanning the media, add the debug log to the zip.
if (!ok) {
qWarning() << "Unexpected errors when scanning SD card, adding debug log to zip.";
QString debugLog = logger->logFileName();
files.AddFile(debugLog, prefix + "-debug.txt");
}
prog->setMessage(tr("Creating zip...")); prog->setMessage(tr("Creating zip..."));
ok = z.AddDirectory(cardPath, prefix, prog);
// Create the zip.
ok = z.AddFiles(files, prog);
z.Close(); z.Close();
} else { } else {
qWarning() << "Unable to open" << filename; qWarning() << "Unable to open" << filename;

2
oscar/mainwindow.h
View File

@ -137,6 +137,8 @@ class MainWindow : public QMainWindow
//! \brief Returns the Overview Tab object //! \brief Returns the Overview Tab object
Overview *getOverview() { return overview; } Overview *getOverview() { return overview; }
void updateOverview();
/*! \fn void RestartApplication(bool force_login=false); /*! \fn void RestartApplication(bool force_login=false);
\brief Closes down OSCAR and restarts it \brief Closes down OSCAR and restarts it
\param bool force_login \param bool force_login

2
oscar/newprofile.cpp
View File

@ -363,6 +363,8 @@ void NewProfile::edit(const QString name)
ui->untreatedAHIEdit->setValue(profile->cpap->untreatedAHI()); ui->untreatedAHIEdit->setValue(profile->cpap->untreatedAHI());
ui->cpapModeCombo->setCurrentIndex((int)profile->cpap->mode()); ui->cpapModeCombo->setCurrentIndex((int)profile->cpap->mode());
on_cpapModeCombo_activated(profile->cpap->mode());
ui->doctorNameEdit->setText(profile->doctor->name()); ui->doctorNameEdit->setText(profile->doctor->name());
ui->doctorPracticeEdit->setText(profile->doctor->practiceName()); ui->doctorPracticeEdit->setText(profile->doctor->practiceName());
ui->doctorPhoneEdit->setText(profile->doctor->phone()); ui->doctorPhoneEdit->setText(profile->doctor->phone());

4
oscar/preferencesdialog.ui
View File

@ -10,7 +10,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>942</width> <width>942</width>
<height>651</height> <height>655</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -2210,7 +2210,7 @@ Mainly affects the importer.</string>
<string>If you are interested in helping test new features and bugfixes early, click here.</string> <string>If you are interested in helping test new features and bugfixes early, click here.</string>
</property> </property>
<property name="text"> <property name="text">
<string>I want to try experimental and test builds. (Advanced users only please.)</string> <string>I want to be notified of test versions. (Advanced users only please.)</string>
</property> </property>
</widget> </widget>
</item> </item>

16
oscar/zip.cpp
View File

@ -168,6 +168,14 @@ bool FileQueue::AddDirectory(const QString & path, const QString & prefix)
QDir dir(path); QDir dir(path);
if (!dir.exists() || !dir.isReadable()) { if (!dir.exists() || !dir.isReadable()) {
qWarning() << dir.canonicalPath() << "can't read directory"; qWarning() << dir.canonicalPath() << "can't read directory";
#if defined(Q_OS_MACOS)
// If this is a directory known to be protected by macOS "Full Disk Access" permissions,
// skip it but don't consider it an error.
static const QSet<QString> s_macProtectedDirs = { ".fseventsd", ".Spotlight-V100", ".Trashes" };
if (s_macProtectedDirs.contains(dir.dirName())) {
return true;
}
#endif
return false; return false;
} }
QString base = prefix; QString base = prefix;
@ -190,14 +198,12 @@ bool FileQueue::AddDirectory(const QString & path, const QString & prefix)
qWarning() << "skipping symlink" << canonicalPath << fi.symLinkTarget(); qWarning() << "skipping symlink" << canonicalPath << fi.symLinkTarget();
} else if (fi.isDir()) { } else if (fi.isDir()) {
// Descend and recurse // Descend and recurse
ok = AddDirectory(canonicalPath, relative_path); ok &= AddDirectory(canonicalPath, relative_path);
} else { } else {
// Add the file to the zip // Add the file to the zip
ok = AddFile(canonicalPath, relative_path); ok &= AddFile(canonicalPath, relative_path);
}
if (!ok) {
break;
} }
// Don't stop in our tracks when we hit an error.
} }
return ok; return ok;