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

channels Updated With Preferences - allows oxi preferences flagPulseAbove/Below and flagSPO2 to work.

Browse Source
This commit is contained in:
LoudSnorer 2023-01-26 07:48:25 -05:00
parent 9543cbd9c2
commit 71373d38b5
4 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oscar/SleepLib/profiles.cpp
View File

@ -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());
};

1
oscar/SleepLib/profiles.h
View File

@ -216,6 +216,7 @@ class Profile : public Preferences
void loadChannels();
void saveChannels();
void refrehOxiChannelsPref();
bool is_first_day;

6
oscar/preferencesdialog.cpp
View File

@ -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();

28
oscar/test_macros.h
View File

@ -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