diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index 5c5f3dee..778aeff0 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -1715,11 +1715,13 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap & 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; } diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp index 6387c6c8..4fc4f736 100644 --- a/oscar/SleepLib/session.cpp +++ b/oscar/SleepLib/session.cpp @@ -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 {