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

clinical Mode: change from Appsetting to p_profile. Implemented default value for New profiles.

Browse Source
This commit is contained in:
LoudSnorer 2023-06-09 12:47:10 -04:00
parent 61c08e35dc
commit 1cd449cd9e
9 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oscar/SleepLib/appsettings.cpp
View File

@ -27,7 +27,6 @@ AppWideSetting::AppWideSetting(Preferences *pref) : PrefSettings(pref)
// initPref(STR_AS_GraphSnapshots, true);
initPref(STR_AS_IncludeSerial, false);
initPref(STR_AS_MonochromePrinting, false);
initPref(STR_AS_ClinicalMode, true);
initPref(STR_AS_ShowPieChart, false);
m_animations = initPref(STR_AS_Animations, true).toBool();
m_squareWavePlots = initPref(STR_AS_SquareWave, false).toBool();

3
oscar/SleepLib/appsettings.h
View File

@ -46,7 +46,6 @@ const QString STR_AS_UsePixmapCaching = "UsePixmapCaching";
const QString STR_AS_AllowYAxisScaling = "AllowYAxisScaling";
const QString STR_AS_IncludeSerial = "IncludeSerial";
const QString STR_AS_MonochromePrinting = "PrintBW";
const QString STR_AS_ClinicalMode = "ClinicalMode";
const QString STR_AS_GraphTooltips = "GraphTooltips";
const QString STR_AS_LineThickness = "LineThickness";
const QString STR_AS_LineCursorMode = "LineCursorMode";
@ -139,7 +138,6 @@ public:
//! \brief Whether to print reports in black and white, which can be more legible on non-color printers
bool monochromePrinting() const { return getPref(STR_AS_MonochromePrinting).toBool(); }
//! \Allow disabling of sessions
bool clinicalMode() const { return getPref(STR_AS_ClinicalMode).toBool(); }
//! \brief Whether to show graph tooltips
inline bool graphTooltips() const { return m_graphTooltips; }
//! \brief Pen width of line plots
@ -199,7 +197,6 @@ public:
void setIncludeSerial(bool b) { setPref(STR_AS_IncludeSerial, b); }
//! \brief Sets whether to print reports in black and white, which can be more legible on non-color printers
void setMonochromePrinting(bool b) { setPref(STR_AS_MonochromePrinting, b); }
void setClinicalMode(bool b) { setPref(STR_AS_ClinicalMode,b); }
//! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
void setGraphTooltips(bool b) { setPref(STR_AS_GraphTooltips, m_graphTooltips=b); }
//! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform)

6
oscar/SleepLib/profiles.h
View File

@ -309,6 +309,7 @@ const QString STR_OS_OxiDiscardThreshold = "OxiDiscardThreshold";
// CPAPSettings Strings
const QString STR_CS_ComplianceHours = "ComplianceHours";
const QString STR_CS_ClinicalMode = "ClinicalMode";
const QString STR_CS_ShowLeaksMode = "ShowLeaksMode";
const QString STR_CS_MaskStartDate = "MaskStartDate";
const QString STR_CS_MaskDescription = "MaskDescription";
@ -559,6 +560,7 @@ class CPAPSettings : public PrefSettings
: PrefSettings(profile)
{
m_complianceHours = initPref(STR_CS_ComplianceHours, 4.0f).toFloat();
m_clinicalMode = initPref(STR_CS_ClinicalMode, false).toBool();
initPref(STR_CS_ShowLeaksMode, 0);
// TODO: jedimark: Check if this date is initiliazed yet
initPref(STR_CS_MaskStartDate, QDate());
@ -595,6 +597,7 @@ class CPAPSettings : public PrefSettings
//Getters
double complianceHours() const { return m_complianceHours; }
bool clinicalMode() const { return m_clinicalMode; }
int leakMode() const { return getPref(STR_CS_ShowLeaksMode).toInt(); }
QDate maskStartDate() const { return getPref(STR_CS_MaskStartDate).toDate(); }
QString maskDescription() const { return getPref(STR_CS_MaskDescription).toString(); }
@ -632,6 +635,7 @@ class CPAPSettings : public PrefSettings
void setNotes(QString notes) { setPref(STR_CS_Notes, notes); }
void setDateDiagnosed(QDate date) { setPref(STR_CS_DateDiagnosed, date); }
void setComplianceHours(EventDataType hours) { setPref(STR_CS_ComplianceHours, m_complianceHours=hours); }
void setClinicalMode(bool mode) { setPref(STR_CS_ClinicalMode, m_clinicalMode=mode); }
void setLeakMode(int leakmode) { setPref(STR_CS_ShowLeaksMode, (int)leakmode); }
void setMaskStartDate(QDate date) { setPref(STR_CS_MaskStartDate, date); }
void setMaskType(MaskType masktype) { setPref(STR_CS_MaskType, (int)masktype); }
@ -659,7 +663,7 @@ class CPAPSettings : public PrefSettings
int m_clock_drift;
double m_4cmH2OLeaks, m_20cmH2OLeaks;
bool m_userEventFlagging, m_userEventDuplicates, m_calcUnintentionalLeaks, m_resyncFromUserFlagging, m_ahiReset;
bool m_showLeakRedline;
bool m_showLeakRedline, m_clinicalMode;
EventDataType m_leakRedLine, m_complianceHours, m_ahiWindow;

2
oscar/SleepLib/session.cpp
View File

@ -93,7 +93,7 @@ void Session::TrashEvents()
bool Session::enabled(bool realValues) const
{
if (AppSetting->clinicalMode() && !realValues) return true;
if (p_profile->cpap->clinicalMode() && !realValues) return true;
return s_enabled;
}

2
oscar/daily.cpp
View File

@ -578,7 +578,7 @@ void Daily::showEvent(QShowEvent *)
bool Daily::rejectToggleSessionEnable( Session*sess) {
if (!sess) return true;
if (AppSetting->clinicalMode()) {
if (p_profile->cpap->clinicalMode()) {
QMessageBox mbox(QMessageBox::Warning, tr("Clinical Mode"), tr(" Disabling Sessions requires the Permissive Mode"), QMessageBox::Ok , this);
mbox.exec();
return true;

2
oscar/dailySearchTab.cpp
View File

@ -307,7 +307,7 @@ void DailySearchTab::populateControl() {
commandList->addItem(calculateMaxSize(tr("Daily Duration"),ST_DAILY_USAGE));
commandList->addItem(calculateMaxSize(tr("Session Duration" ),ST_SESSION_LENGTH));
commandList->addItem(calculateMaxSize(tr("Days Skipped"),ST_DAYS_SKIPPED));
if ( !AppSetting->clinicalMode() ) {
if ( !p_profile->cpap->clinicalMode() ) {
commandList->addItem(calculateMaxSize(tr("Disabled Sessions"),ST_DISABLED_SESSIONS));
}
commandList->addItem(calculateMaxSize(tr("Number of Sessions"),ST_SESSIONS_QTY));

19
oscar/mainwindow.cpp
View File

@ -292,8 +292,6 @@ void MainWindow::SetupGUI()
ui->tabWidget->addTab(help, tr("Help Browser"));
#endif
setupRunning = false;
m_clinicalMode = AppSetting->clinicalMode();
}
void MainWindow::logMessage(QString msg)
@ -478,6 +476,7 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
return false;
}
}
prof = profileSelector->SelectProfile(profileName, skippassword); // asks for the password and updates stuff in profileSelector tab
if (!prof) {
return false;
@ -487,6 +486,7 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
// Check Lockfile
QString lockhost = prof->checkLock();
if (!lockhost.isEmpty()) {
if (lockhost.compare(QHostInfo::localHostName()) != 0) {
if (QMessageBox::warning(nullptr, STR_MessageBox_Warning,
@ -502,7 +502,6 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
}
p_profile = prof;
ProgressDialog * progress = new ProgressDialog(this);
progress->setMessage(QObject::tr("Loading profile \"%1\"...").arg(profileName));
@ -545,6 +544,15 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
}
p_profile->LoadMachineData(progress);
if (!p_profile->LastDay(MT_CPAP).isValid() ) { // quick test if new profile or not.
// Override default value of clinicalMode if new profile.
// Allows permissiveMode (not clinicalMode) to be the default value for existing profiles.
p_profile->cpap->setClinicalMode(true);
}
m_clinicalMode = p_profile->cpap->clinicalMode();
progress->setMessage(tr("Loading profile \"%1\"").arg(profileName));
// Show the logo?
@ -628,6 +636,7 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
break;
}
progress->close();
delete progress;
qDebug() << "Finished opening Profile";
@ -1401,8 +1410,8 @@ void MainWindow::on_action_Preferences_triggered()
setApplicationFont();
if (m_clinicalMode != AppSetting->clinicalMode() ) {
m_clinicalMode = AppSetting->clinicalMode();
if (m_clinicalMode != p_profile->cpap->clinicalMode() ) {
m_clinicalMode = p_profile->cpap->clinicalMode(); ;
reloadProfile();
};

8
oscar/preferencesdialog.cpp
View File

@ -241,11 +241,12 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->allowYAxisScaling->setChecked(AppSetting->allowYAxisScaling());
ui->includeSerial->setChecked(AppSetting->includeSerial());
ui->monochromePrinting->setChecked(AppSetting->monochromePrinting());
ui->clinicalMode->setChecked(AppSetting->clinicalMode());
ui->complianceHours->setValue(profile->cpap->complianceHours());
ui->clinicalMode->setChecked(profile->cpap->clinicalMode());
ui->clinicalTextEdit->setPlainText(clinicalHelp());
// clinicalMode and permissiveMode are radio buttons and must be set to opposite values. Once clinicalMode is used.
// Radio Buttons illustrate the operating mode.
ui->permissiveMode->setChecked(!AppSetting->clinicalMode());
ui->permissiveMode->setChecked(!profile->cpap->clinicalMode());
ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport());
#ifndef NO_CHECKUPDATES
@ -288,7 +289,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->cacheSessionData->setChecked(AppSetting->cacheSessions());
ui->preloadSummaries->setChecked(profile->session->preloadSummaries());
ui->animationsAndTransitionsCheckbox->setChecked(AppSetting->animations());
ui->complianceHours->setValue(profile->cpap->complianceHours());
ui->prefCalcMiddle->setCurrentIndex(profile->general->prefCalcMiddle());
ui->prefCalcMax->setCurrentIndex(profile->general->prefCalcMax());
@ -857,7 +857,7 @@ bool PreferencesDialog::Save()
AppSetting->setAllowYAxisScaling(ui->allowYAxisScaling->isChecked());
AppSetting->setIncludeSerial(ui->includeSerial->isChecked());
AppSetting->setMonochromePrinting(ui->monochromePrinting->isChecked());
AppSetting->setClinicalMode(ui->clinicalMode->isChecked());
p_profile->cpap->setClinicalMode(ui->clinicalMode->isChecked());
AppSetting->setGraphTooltips(ui->graphTooltips->isChecked());
AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked());

4
oscar/statistics.cpp
View File

@ -173,7 +173,7 @@ void Statistics::updateDisabledInfo()
void DisabledInfo::update(QDate latestDate, QDate earliestDate)
{
clear();
if ( (!latestDate.isValid()) || (!earliestDate.isValid()) || (AppSetting->clinicalMode()) )return;
if ( (!latestDate.isValid()) || (!earliestDate.isValid()) || (p_profile->cpap->clinicalMode()) ) return;
qint64 complianceHours = 3600000.0 * p_profile->cpap->complianceHours(); // conbvert to ms
totalDays = 1+earliestDate.daysTo(latestDate);
for (QDate date = latestDate ; date >= earliestDate ; date=date.addDays(-1) ) {
@ -632,7 +632,7 @@ Statistics::Statistics(QObject *parent) :
QObject(parent)
{
rows.push_back(StatisticsRow(tr("CPAP Statistics"), SC_HEADING, MT_CPAP));
if (!AppSetting->clinicalMode()) {
if (!p_profile->cpap->clinicalMode()) {
updateDisabledInfo();
rows.push_back(StatisticsRow(disabledInfo.display(0),SC_WARNING ,MT_CPAP));
rows.push_back(StatisticsRow(disabledInfo.display(1),SC_WARNING2,MT_CPAP));