From d990ce560ac351395009b93490f64e876207a68c Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Mon, 16 Sep 2019 12:05:47 -0700 Subject: [PATCH] Report pressure when IPAP is missing. This is a preliminary change and will be improved later. --- oscar/SleepLib/day.cpp | 21 +++++++++++++++++++-- oscar/SleepLib/day.h | 3 +++ oscar/welcome.cpp | 25 +++++++++++++------------ 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp index cc836075..e2abbcb1 100644 --- a/oscar/SleepLib/day.cpp +++ b/oscar/SleepLib/day.cpp @@ -109,7 +109,7 @@ void Day::addSession(Session *s) if (mi != machines.end()) { if (mi.value() != s->machine()) { qDebug() << "OSCAR can't add session" << s->session() - << "["+QDateTime::fromTime_t(s->first()).toString("MMM dd, yyyy hh:mm:ss")+"]" + << "["+QDateTime::fromTime_t(s->session()).toString("MMM dd, yyyy hh:mm:ss")+"]" << "from machine" << mi.value()->serial() << "to machine" << s->machine()->serial() << "to this day record, as it already contains a different machine of the same MachineType" << s->type(); return; @@ -803,6 +803,23 @@ qint64 Day::total_time(MachineType type) return total; //d_totaltime; } +ChannelID Day::getPressureChannelID() { + // Determined the preferred pressure channel (CPAP_IPAP or CPAP_Pressure) + CPAPMode cpapmode = (CPAPMode)(int)settings_max(CPAP_Mode); + ChannelID preferredID = CPAP_Pressure; + if (cpapmode == MODE_ASV || cpapmode == MODE_ASV_VARIABLE_EPAP || cpapmode == MODE_AVAPS) + preferredID = CPAP_IPAP; + + // If preferred channel has data, return it + if (channelHasData(preferredID)) + return preferredID; + + // Otherwise return the other pressure channel + if (preferredID == CPAP_IPAP) + return CPAP_Pressure; + else + return CPAP_IPAP; +} bool Day::hasEnabledSessions() { @@ -1479,7 +1496,7 @@ QString Day::getPressureSettings() } else if (mode == MODE_BILEVEL_AUTO_VARIABLE_PS) { return QObject::tr("Min EPAP %1 Max IPAP %2 PS %3-%4 (%5)").arg(settings_min(CPAP_EPAPLo),0,'f',1).arg(settings_max(CPAP_IPAPHi),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units); } else if (mode == MODE_ASV) { - return QObject::tr("EPAP %1 PS %2-%3 (%6)").arg(settings_min(CPAP_EPAP),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units); + return QObject::tr("EPAP %1 PS %2-%3 (%4)").arg(settings_min(CPAP_EPAP),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units); } else if (mode == MODE_ASV_VARIABLE_EPAP) { return QObject::tr("Min EPAP %1 Max IPAP %2 PS %3-%4 (%5)"). arg(settings_min(CPAP_EPAPLo),0,'f',1). diff --git a/oscar/SleepLib/day.h b/oscar/SleepLib/day.h index fada4561..73c4e481 100644 --- a/oscar/SleepLib/day.h +++ b/oscar/SleepLib/day.h @@ -213,6 +213,9 @@ class Day //! \brief Closes all Events files for this Days Sessions void CloseEvents(); + //! \brief Get the ChannelID to be used for reporting pressure + ChannelID getPressureChannelID(); + //! \brief Returns true if this Day contains loaded Event Data for this channel. bool channelExists(ChannelID id); diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp index 29e4a2bc..c263eb33 100644 --- a/oscar/welcome.cpp +++ b/oscar/welcome.cpp @@ -227,34 +227,35 @@ QString Welcome::GenerateCPAPHTML() html += "
"; CPAPMode cpapmode = (CPAPMode)(int)day->settings_max(CPAP_Mode); + ChannelID pressChanID = day->getPressureChannelID(); // Get channel id for pressure that we should report double perc= p_profile->general->prefCalcPercentile(); if (cpapmode == MODE_CPAP) { - EventDataType pressure = day->settings_max(CPAP_Pressure); - html += tr("Your CPAP machine used a constant %1 %2 of air").arg(pressure).arg(schema::channel[CPAP_Pressure].units()); + EventDataType pressure = day->settings_max(pressChanID); + html += tr("Your CPAP machine used a constant %1 %2 of air").arg(pressure).arg(schema::channel[pressChanID].units()); } else if (cpapmode == MODE_APAP) { - EventDataType pressure = day->percentile(CPAP_Pressure, perc/100.0); - html += tr("Your pressure was under %1 %2 for %3% of the time.").arg(pressure).arg(schema::channel[CPAP_Pressure].units()).arg(perc); + EventDataType pressure = day->percentile(pressChanID, perc/100.0); + html += tr("Your pressure was under %1 %2 for %3% of the time.").arg(pressure).arg(schema::channel[pressChanID].units()).arg(perc); } else if (cpapmode == MODE_BILEVEL_FIXED) { - EventDataType ipap = day->settings_max(CPAP_IPAP); + EventDataType ipap = day->settings_max(pressChanID); EventDataType epap = day->settings_min(CPAP_EPAP); - html += tr("Your machine used a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units()); + html += tr("Your machine used a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units()); } else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) { - EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0); + EventDataType ipap = day->percentile(pressChanID, perc/100.0); EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0); - html += tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units()).arg(perc); + html += tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc); } else if (cpapmode == MODE_ASV){ - EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0); + EventDataType ipap = day->percentile(pressChanID, perc/100.0); EventDataType epap = qRound(day->settings_wavg(CPAP_EPAP)); html += tr("Your EPAP pressure fixed at %1 %2.").arg(epap).arg(schema::channel[CPAP_EPAP].units())+"
"; - html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc); + html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc); } else if (cpapmode == MODE_ASV_VARIABLE_EPAP){ - EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0); + EventDataType ipap = day->percentile(pressChanID, perc/100.0); EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0); html += tr("Your EPAP pressure was under %1 %2 for %3% of the time.").arg(epap).arg(schema::channel[CPAP_EPAP].units()).arg(perc)+"
"; - html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc); + html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc); } html += "
";