From 265bdc2d7ef80911a09ae4a3b7cde1aab3034e09 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Sun, 30 Aug 2020 13:43:00 -0700
Subject: [PATCH] Welcome page code cleanup. - 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.

---
 oscar/SleepLib/day.cpp |  2 +-
 oscar/SleepLib/day.h   |  1 +
 oscar/welcome.cpp      | 37 ++++++++++++++++++++++++++-----------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp
index 6f140f96..3e701bea 100644
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@@ -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);
diff --git a/oscar/SleepLib/day.h b/oscar/SleepLib/day.h
index 73c4e481..8651442c 100644
--- a/oscar/SleepLib/day.h
+++ b/oscar/SleepLib/day.h
@@ -242,6 +242,7 @@ class Day
     QString getCPAPModeStr();
     QString getPressureRelief();
     QString getPressureSettings();
+    QString validPressure(float pressure);
 
     // Some more very much CPAP only related stuff
 
diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp
index df021a40..77f34e01 100644
--- a/oscar/welcome.cpp
+++ b/oscar/welcome.cpp
@@ -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);