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

Fix channel type test, attempt SmartStop display

Browse Source
This commit is contained in:
Phil Olynyk 2021-08-22 17:39:13 -04:00
parent 2326ed4fc8
commit ec1a7a6df7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1715,11 +1715,13 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.s_SmartStart = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
if ( AS_eleven )
R.s_SmartStart--;
// qDebug() << "SmartStart is set to" << R.s_SmartStart;
}
if ((sig = str.lookupLabel("S.SmartStop"))) {
R.s_SmartStop = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
if ( AS_eleven )
R.s_SmartStop--;
qDebug() << "SmartStop is set to" << R.s_SmartStop;
}
if ((sig = str.lookupLabel("S.HumEnable"))) {
R.s_HumEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
@ -2274,6 +2276,9 @@ void StoreSettings(Session * sess, STRRecord & R)
if (R.s_SmartStart >= 0) {
sess->settings[RMS9_SmartStart] = R.s_SmartStart;
}
if (R.s_SmartStop >= 0) {
sess->settings[RMAS11_SmartStop] = R.s_SmartStop;
}
if (R.s_ABFilter >= 0) {
sess->settings[RMS9_ABFilter] = R.s_ABFilter;
}

2
oscar/SleepLib/session.cpp
View File

@ -1143,7 +1143,7 @@ void Session::updateCountSummary(ChannelID code)
using namespace schema;
Channel *ch_p = channel.channels[code];
if ( ! ch_p->isNull() ) { // the channel was found in the channel list
if ( ((ch_p->type() & ~(FLAG|SPAN)) == 0) ) { // the channel is not a flag or span type
if ( ((ch_p->type() & (FLAG|SPAN)) == 0) ) { // the channel is not a flag or span type
qDebug() << "No valuesummary for channel " << ch_p->label(); // so tell about missing summary
}
} else {