From 71373d38b584bf20755e90638bc4b5357fc3b16b Mon Sep 17 00:00:00 2001
From: LoudSnorer <just4me.1947@gmail.com>
Date: Thu, 26 Jan 2023 07:48:25 -0500
Subject: [PATCH] channels Updated With Preferences - allows oxi preferences
 flagPulseAbove/Below and flagSPO2 to work.

---
 oscar/SleepLib/profiles.cpp | 15 ++++++++++++---
 oscar/SleepLib/profiles.h   |  1 +
 oscar/preferencesdialog.cpp |  6 +-----
 oscar/test_macros.h         | 28 ++++++++++++++++------------
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp
index 64217a31..0253b068 100644
--- a/oscar/SleepLib/profiles.cpp
+++ b/oscar/SleepLib/profiles.cpp
@@ -7,6 +7,9 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
 #include <QString>
 #include <QDateTime>
 #include <QDir>
@@ -2101,7 +2104,7 @@ void Profile::loadChannels()
 
         if (chan->isNull()) {
             qDebug() << "loadChannels has no idea about channel" << name;
-            if (in.atEnd()) return;
+            if (in.atEnd()) break;
             continue;
         }
         chan->setEnabled(enabled);
@@ -2122,8 +2125,14 @@ void Profile::loadChannels()
         chan->setUpperThresholdColor(upperThresholdColor);
 
         chan->setShowInOverview(showOverview);
-        if (in.atEnd()) return;
+        if (in.atEnd()) break;
     }
-
     f.close();
+    refrehOxiChannelsPref();
 }
+
+void Profile::refrehOxiChannelsPref() {
+    schema::channel[OXI_Pulse].setLowerThreshold(oxi->flagPulseBelow());
+    schema::channel[OXI_Pulse].setUpperThreshold(oxi->flagPulseAbove());
+    schema::channel[OXI_SPO2].setLowerThreshold(oxi->oxiDesaturationThreshold());
+};
diff --git a/oscar/SleepLib/profiles.h b/oscar/SleepLib/profiles.h
index 7139343e..2d0f127a 100644
--- a/oscar/SleepLib/profiles.h
+++ b/oscar/SleepLib/profiles.h
@@ -216,6 +216,7 @@ class Profile : public Preferences
 
     void loadChannels();
     void saveChannels();
+    void refrehOxiChannelsPref();
 
 
     bool is_first_day;
diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp
index a91b46ed..827acc8f 100644
--- a/oscar/preferencesdialog.cpp
+++ b/oscar/preferencesdialog.cpp
@@ -820,11 +820,6 @@ bool PreferencesDialog::Save()
         }
     }
 
-    schema::channel[OXI_SPO2].setLowerThreshold(ui->oxiDesaturationThreshold->value());
-    schema::channel[OXI_Pulse].setLowerThreshold(ui->flagPulseBelow->value());
-    schema::channel[OXI_Pulse].setUpperThreshold(ui->flagPulseAbove->value());
-
-
     AppSetting->setUserEventPieChart(ui->showUserFlagsInPie->isChecked());
     profile->session->setLockSummarySessions(ui->LockSummarySessionSplitting->isChecked());
     profile->session->setWarnOnUntestedMachine(ui->warnOnUntestedMachine->isChecked());
@@ -986,6 +981,7 @@ bool PreferencesDialog::Save()
 
     p_pref->Save();
     profile->Save();
+    profile->refrehOxiChannelsPref();
 
     if (recompress_events) {
         mainwin->recompressEvents();
diff --git a/oscar/test_macros.h b/oscar/test_macros.h
index 14e6439d..b6d4f00e 100644
--- a/oscar/test_macros.h
+++ b/oscar/test_macros.h
@@ -17,10 +17,10 @@ When only these macos are used then debugging is disabled.
 SO for production code rename TEST_MACROS_ENABLED to TEST_MACROS_ENABLEDoff
 
 ###########################################
-The the following to source cpp files 
+The the following to source cpp files
 to turn on the debug macros for use.
 
-#define TEST_MACROS_ENABLED 
+#define TEST_MACROS_ENABLED
 #include <test_macros.h>
 
 To turn off the the test macros.
@@ -38,11 +38,13 @@ To turn off the the test macros.
 #include <QRegularExpression>
 #include <QFileInfo>
 
-#define DEBUGQ  qDebug().noquote()
-#define DEBUGL  DEBUGQ	<<QString("%1[%2]").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__)
-#define DEBUGF  DEBUGQ	<<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
-#define DEBUGT  DEBUGQ	<<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__)
-#define DEBUGTF DEBUGQ	<<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
+#define DEBUGQ   qDebug().noquote()
+#define DEBUGW   qWarning().noquote()
+#define DEBUGL   DEBUGQ	<<QString("%1[%2]").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__)
+#define DEBUGF   DEBUGQ	<<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
+#define DEBUGFW  DEBUGW	<<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
+#define DEBUGT   DEBUGQ	<<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__)
+#define DEBUGTF  DEBUGQ	<<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
 
                                     // Do nothing
 #define Z( EXPRESSION ) 			/* comment out display of variable */
@@ -68,7 +70,7 @@ To turn off the the test macros.
 #elif __GNUC_VERSION__
     #define COMPILER O(QString("GNUC++:%1").arg("GNUC").arg(__GNUC_VERSION__)) ;
 #else
-    #define COMPILER 
+    #define COMPILER
 #endif
 
 
@@ -81,10 +83,10 @@ To turn off the the test macros.
 //12361: Debug: "gGraphView[572]popoutGraph"
 
 //example:  DEBUGT;
-//12645: Debug: "06:00:18.284 gGraphView[622]" 
+//12645: Debug: "06:00:18.284 gGraphView[622]"
 
 //example:  DEBUGTF;
-//12645: Debug: "06:00:18.284 gGraphView[622]popoutGraph" 
+//12645: Debug: "06:00:18.284 gGraphView[622]popoutGraph"
 
 //example:  DEBUGF Q(name) Q(title) QQ("UNITS",units) Q(height) Q(group);
 //00791: Debug: "gGraph[137]gGraph" name: "RespRate" title: "Respiratory Rate" "UNITS": "Rate of breaths per minute" height: 180 group: 0
@@ -99,9 +101,11 @@ To turn off the the test macros.
 #else
 // Turn debugging off.  macros expands to white space
 
-#define DEBUGQ 
+#define DEBUGQ
+#define DEBUGW
 #define DEBUGL
 #define DEBUGF
+#define DEBUGFW
 #define DEBUGT
 #define DEBUGTF
 
@@ -114,7 +118,7 @@ To turn off the the test macros.
 #define FULLNAME( id)
 #define DATE( XX )
 #define DATETIME( XX )
-#define COMPILER 
+#define COMPILER
 
 #endif
 #endif