From b87e700119e8f3229a4f20909a4609beda569dd4 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Fri, 10 May 2019 17:53:09 -0700
Subject: [PATCH] Initial code to show ResMed EPR with a space between number
 and cmH2O

---
 oscar/SleepLib/common.cpp | 17 +++++++++++++++++
 oscar/SleepLib/common.h   |  3 +++
 oscar/statistics.cpp      |  9 +++++----
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp
index 1069ea22..0f287401 100644
--- a/oscar/SleepLib/common.cpp
+++ b/oscar/SleepLib/common.cpp
@@ -238,6 +238,23 @@ QString weightString(float kg, UnitSystem us)
     return ("Bad UnitSystem");
 }
 
+// Format perssure relief
+QString formatRelief (QString relief)
+{
+    int icm = 0;
+    QString newRelief = relief;
+    if (relief == nullptr )
+        return relief;
+    icm = relief.indexOf("cmH2O");
+    if (icm >= 1) {
+        QChar t = relief.mid(icm-1,1)[0];
+        if (t.isDigit())
+            newRelief = relief.insert(icm, " ");
+    }
+//  qDebug() << "Relief input" << relief << "returning" << newRelief;
+    return newRelief;
+}
+
 bool operator <(const ValueCount &a, const ValueCount &b)
 {
     return a.value < b.value;
diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h
index 5d2d0304..35ec57bb 100644
--- a/oscar/SleepLib/common.h
+++ b/oscar/SleepLib/common.h
@@ -85,6 +85,9 @@ const float pound_convert = ounce_convert * 16;
 
 QString weightString(float kg, UnitSystem us = US_Undefined);
 
+//! \brief Format pressure relief by placing a space before cmH2O if not already there
+QString formatRelief (QString relief);
+
 //! \brief Mercilessly trash a directory
 bool removeDir(const QString &path);
 
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 1c3b16e0..1217ad10 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -34,6 +34,7 @@ QString formatTime(float time)
     return QString().sprintf("%02i:%02i", hours, minutes); //,seconds);
 }
 
+
 QDataStream & operator>>(QDataStream & in, RXItem & rx)
 {
     in >> rx.start;
@@ -375,7 +376,7 @@ void Statistics::updateRXChanges()
         // Get Event flags list
         QList<ChannelID> flags3 = day->getSortedMachineChannels(MT_CPAP, schema::FLAG | schema::MINOR_FLAG | schema::SPAN);
 
-        // Generate pressure/mode/relief strings
+        // Generate pressure/mode/`strings
         QString relief = day->getPressureRelief();
         QString mode = day->getCPAPMode();
         QString pressure = day->getPressureSettings();
@@ -936,7 +937,7 @@ QString Statistics::GenerateRXChanges()
                 QString("<td>%1</td>").arg(ahi, 0, 'f', 2)+
                 QString("<td>%1</td>").arg(fli, 0, 'f', 2)+
                 QString("<td>%1 (%2)</td>").arg(rx.machine->model()).arg(rx.machine->modelnumber())+
-                QString("<td>%1</td>").arg(rx.relief)+
+                QString("<td>%1</td>").arg(formatRelief(rx.relief))+
                 QString("<td>%1</td>").arg(rx.mode)+
                 QString("<td>%1</td>").arg(rx.pressure)+
                 "</tr>";
@@ -1456,7 +1457,7 @@ void Statistics::UpdateRecordsBox()
             html += tr("Culminative AHI: %1").arg(double(rxbest.ahi) / rxbest.hours, 0, 'f', 2) + "<br/>";
             html += tr("Culminative Hours: %1").arg(rxbest.hours, 0, 'f', 2) + "<br/>";
             html += QString("%1").arg(rxbest.pressure) + "<br/>";
-            html += QString("%1").arg(rxbest.relief) + "<br/>";
+            html += QString("%1").arg(formatRelief(rxbest.relief)) + "<br/>";
             html += "<br/>";
 
             html += "<b>"+tr("Worst RX Setting")+"</b><br/>";
@@ -1469,7 +1470,7 @@ void Statistics::UpdateRecordsBox()
             html += tr("Culminative Hours: %1").arg(rxworst.hours, 0, 'f', 2) + "<br/>";
 
             html += QString("%1").arg(rxworst.pressure) + "<br/>";
-            html += QString("%1").arg(rxworst.relief) + "<br/>";
+            html += QString("%1").arg(formatRelief(rxworst.relief)) + "<br/>";
         }
     }