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

Fix pressure display on welcome page for PRS1 non-ventilators.

Browse Source
This commit is contained in:
sawinglogz 2020-03-29 21:50:19 -04:00
parent 217c71d1de
commit f2f9019d5c
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
oscar/SleepLib/day.cpp
View File

@ -809,19 +809,23 @@ ChannelID Day::getPressureChannelID() {
// See the comment in getCPAPModeStr(). // See the comment in getCPAPModeStr().
// Determined the preferred pressure channel (CPAP_IPAP or CPAP_Pressure) // Determined the preferred pressure channel (CPAP_IPAP or CPAP_Pressure)
CPAPMode cpapmode = (CPAPMode)(int)settings_max(CPAP_Mode); 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 // TODO: This is also an awful hack. Why would CPAP/APAP have IPAP channels but not Pressure channels?
if (channelHasData(preferredID)) // And why would ASV or AVAPS have Pressure channels?
return preferredID; QList<ChannelID> preferredIDs = { CPAP_Pressure, CPAP_PressureSet, CPAP_IPAP, CPAP_IPAPSet };
if (cpapmode == MODE_ASV || cpapmode == MODE_ASV_VARIABLE_EPAP || cpapmode == MODE_AVAPS) {
preferredIDs = { CPAP_IPAP, CPAP_IPAPSet, CPAP_Pressure, CPAP_PressureSet };
}
// Otherwise return the other pressure channel for (auto & preferredID : preferredIDs) {
if (preferredID == CPAP_IPAP) // If preferred channel has data, return it
return CPAP_Pressure; if (channelHasData(preferredID)) {
else //qDebug() << QString("Found pressure channel 0x%1").arg(preferredID, 4, 16, QChar('0'));
return CPAP_IPAP; return preferredID;
}
}
return NoChannel;
} }
bool Day::hasEnabledSessions() bool Day::hasEnabledSessions()

18
oscar/welcome.cpp
View File

@ -230,14 +230,28 @@ QString Welcome::GenerateCPAPHTML()
ChannelID pressChanID = day->getPressureChannelID(); // Get channel id for pressure that we should report ChannelID pressChanID = day->getPressureChannelID(); // Get channel id for pressure that we should report
double perc= p_profile->general->prefCalcPercentile(); double perc= p_profile->general->prefCalcPercentile();
// When CPAP_PressureSet and CPAP_IPAPSet have data (used for percentiles, etc.)
// CPAP_Pressure and CPAP_IPAP are their corresponding settings channels.
ChannelID pressSettingChanID;
if (pressChanID == CPAP_PressureSet) {
pressSettingChanID = CPAP_Pressure;
} else if (pressChanID == CPAP_IPAPSet) {
pressSettingChanID = CPAP_IPAP;
} else {
pressSettingChanID = pressChanID;
}
if (pressChanID == NoChannel) {
qWarning() << "Unable to find pressure channel for welcome summary!";
}
if (cpapmode == MODE_CPAP) { if (cpapmode == MODE_CPAP) {
EventDataType pressure = day->settings_max(pressChanID); EventDataType pressure = day->settings_max(pressSettingChanID);
html += tr("Your CPAP machine used a constant %1 %2 of air").arg(pressure).arg(schema::channel[pressChanID].units()); html += tr("Your CPAP machine used a constant %1 %2 of air").arg(pressure).arg(schema::channel[pressChanID].units());
} else if (cpapmode == MODE_APAP) { } else if (cpapmode == MODE_APAP) {
EventDataType pressure = day->percentile(pressChanID, perc/100.0); 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); 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) { } else if (cpapmode == MODE_BILEVEL_FIXED) {
EventDataType ipap = day->settings_max(pressChanID); EventDataType ipap = day->settings_max(pressSettingChanID);
EventDataType epap = day->settings_min(CPAP_EPAP); 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[pressChanID].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) { } else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) {