From c8c0fe45303eedfb46b0b9d1441ba3263af666a0 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Sat, 17 Dec 2022 11:40:59 -0500
Subject: [PATCH] Minor fixes to settings display

---
 oscar/SleepLib/common.cpp                       | 2 ++
 oscar/SleepLib/common.h                         | 1 +
 oscar/SleepLib/loader_plugins/resmed_loader.cpp | 8 +++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp
index 18738e13..d1d9db8b 100644
--- a/oscar/SleepLib/common.cpp
+++ b/oscar/SleepLib/common.cpp
@@ -464,6 +464,7 @@ QString STR_UNIT_CMH2O;
 QString STR_UNIT_Hours;
 QString STR_UNIT_Minutes;
 QString STR_UNIT_Seconds;
+QString STR_UNIT_milliSeconds;
 QString STR_UNIT_h;
 QString STR_UNIT_m;
 QString STR_UNIT_s;
@@ -674,6 +675,7 @@ void initializeStrings()
     STR_UNIT_Hours = QObject::tr("Hours");
     STR_UNIT_Minutes = QObject::tr("Minutes");
     STR_UNIT_Seconds = QObject::tr("Seconds");
+    STR_UNIT_milliSeconds = QObject::tr("milliSeconds");
     STR_UNIT_h = QObject::tr("h"); // hours shortform
     STR_UNIT_m = QObject::tr("m"); // minutes shortform
     STR_UNIT_s = QObject::tr("s"); // seconds shortform
diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h
index cd639b8d..30317b20 100644
--- a/oscar/SleepLib/common.h
+++ b/oscar/SleepLib/common.h
@@ -187,6 +187,7 @@ extern QString STR_UNIT_CMH2O;
 extern QString STR_UNIT_Hours;
 extern QString STR_UNIT_Minutes;
 extern QString STR_UNIT_Seconds;
+extern QString STR_UNIT_milliSeconds;
 extern QString STR_UNIT_h; // (h)ours, (m)inutes, (s)econds
 extern QString STR_UNIT_m;
 extern QString STR_UNIT_s;
diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index 51ed48d1..bf20b28b 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -229,7 +229,7 @@ void ResmedLoader::initChannels()
     chan->addOption(1, "Enabled");
 
     channel.add(GRP_CPAP, chan = new Channel(RMAS1x_RiseTime = 0xe213, SETTING, MT_CPAP, SESSION,
-        "RMAS1x_RiseTime", QObject::tr("RiseTime"), QObject::tr("RiseTime"), QObject::tr("RiseTime"), "", INTEGER, Qt::black));
+        "RMAS1x_RiseTime", QObject::tr("RiseTime"), QObject::tr("RiseTime"), QObject::tr("RiseTime"), STR_UNIT_milliSeconds, INTEGER, Qt::black));
 
     channel.add(GRP_CPAP, chan = new Channel(RMAS1x_Cycle = 0xe214, SETTING, MT_CPAP, SESSION,
         "RMAS1x_Cycle", QObject::tr("Cycle"), QObject::tr("Cycle"), QObject::tr("Cycle"), "", LOOKUP, Qt::black));
@@ -248,11 +248,11 @@ void ResmedLoader::initChannels()
     chan->addOption(4, "Very High");
 
     channel.add(GRP_CPAP, chan = new Channel(RMAS1x_TiMax = 0xe216, SETTING, MT_CPAP, SESSION,
-        "RMAS1x_TiMax", QObject::tr("TiMax"), QObject::tr("TiMax"), QObject::tr("TiMax"), "", INTEGER, Qt::black));
+        "RMAS1x_TiMax", QObject::tr("TiMax"), QObject::tr("TiMax"), QObject::tr("TiMax"), STR_UNIT_Seconds, DOUBLE, Qt::black));
     chan->addOption(0, "0");
 
     channel.add(GRP_CPAP, chan = new Channel(RMAS1x_TiMin = 0xe217, SETTING, MT_CPAP, SESSION,
-        "RMAS1x_TiMin", QObject::tr("TiMin"), QObject::tr("TiMin"), QObject::tr("TiMin"), "", INTEGER, Qt::black));
+        "RMAS1x_TiMin", QObject::tr("TiMin"), QObject::tr("TiMin"), QObject::tr("TiMin"), STR_UNIT_Seconds, DOUBLE, Qt::black));
     chan->addOption(0, "0");
 
     // Setup ResMeds signal name translation map
@@ -3505,7 +3505,9 @@ void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es,
                 if (forceDebug)
 //                  qDebug() << "New EventList:" << channel.channels[code]->code() << QDateTime::fromMSecsSinceEpoch(tt).toString();
                     qDebug() << "New EventList:" << QString::number(code, 16) << QDateTime::fromMSecsSinceEpoch(tt).toString();
+
                 el->AddEvent(tt, last);
+
                 if (forceDebug && ((code == CPAP_Pressure) || (code == CPAP_IPAP) || (code == CPAP_EPAP)) )
                     qDebug() << "First Event:" << tmp << QDateTime::fromMSecsSinceEpoch(tt).toString() << "Pos:" << (sptr-1) - es.dataArray;
                 tt += rate;