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

Welcome page code cleanup.

Browse Source 
- make Day::validPressure() available
- Welcome page to report n/a if pressure not valid (but it should always be valid)
- Did NOT add validPressure() call to all pressure reports.
This commit is contained in:
Guy Scharf 2020-08-30 13:43:00 -07:00
parent 1f53b558ab
commit 265bdc2d7e
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/day.cpp
View File

@ -1513,7 +1513,7 @@ QString Day::getPressureRelief()
return pr_str;
}
QString validPressure(float pressure) {
QString Day::validPressure(float pressure) {
if (fabsf(pressure) == std::numeric_limits<EventDataType>::max())
return QObject::tr("n/a");
return QString("%1").arg(pressure, 0, 'f', 1);

1
oscar/SleepLib/day.h
View File

@ -242,6 +242,7 @@ class Day
QString getCPAPModeStr();
QString getPressureRelief();
QString getPressureSettings();
QString validPressure(float pressure);
// Some more very much CPAP only related stuff

37
oscar/welcome.cpp
View File

@ -253,26 +253,41 @@ QString Welcome::GenerateCPAPHTML()
pressSettingChanID = CPAP_Pressure; // DreamStation ventilators report EPAP/IPAP data, but the setting is Pressure
EventDataType pressure = day->settings_max(pressSettingChanID);
qDebug() << pressSettingChanID << pressure;
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) {
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) {
if (pressSettingChanID == CPAP_Pressure && p_profile->GetMachine(MT_CPAP)->info.brand==QObject::tr("ResMed")) {
pressSettingChanID = CPAP_IPAP;
}
EventDataType ipap = day->settings_max(pressSettingChanID);
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());
// pressSettingChanID = CPAP_IPAP;
// EventDataType ipap = day->settings_max(pressSettingChanID);
// EventDataType epap = day->settings_min(CPAP_EPAP);
html += tr("Your machine used a constant %1-%2 %3 of air.")
.arg(day->validPressure(day->settings_min(CPAP_EPAP)))
.arg(day->validPressure(day->settings_max(CPAP_IPAP)))
.arg(schema::channel[CPAP_IPAP].units());
} else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) {
EventDataType ipap = day->percentile(pressChanID, perc/100.0);
EventDataType epap = day->percentile(epapDataChanID, perc/100.0);
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);
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 || cpapmode == MODE_AVAPS){
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[epapDataChanID].units())+"<br/>";
html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc);
html += tr("Your EPAP pressure fixed at %1 %2.")
.arg(epap)
.arg(schema::channel[epapDataChanID].units())+"<br/>";
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 || cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS){
EventDataType ipap = day->percentile(pressChanID, perc/100.0);
EventDataType epap = day->percentile(epapDataChanID, perc/100.0);