diff --git a/oscar/Graphs/gOverviewGraph.cpp b/oscar/Graphs/gOverviewGraph.cpp index 77a7c47f..4a17e628 100644 --- a/oscar/Graphs/gOverviewGraph.cpp +++ b/oscar/Graphs/gOverviewGraph.cpp @@ -559,10 +559,6 @@ void gOverviewGraph::paint(QPainter &painter, gGraph &w, const QRegion ®ion) float compliance_hours = 0; - if (p_profile->cpap->showComplianceInfo()) { - compliance_hours = p_profile->cpap->complianceHours(); - } - int incompliant = 0; Day *day; EventDataType hours; @@ -1008,15 +1004,6 @@ jumpnext: }*/ a += QString(QObject::tr("Days: %1")).arg(total_days, 0); - if (p_profile->cpap->showComplianceInfo()) { - if (ishours && incompliant > 0) { - a += " "+QString(QObject::tr("Low Usage Days: %1")).arg(incompliant, 0)+ - " "+QString(QObject::tr("(%1% compliant, defined as > %2 hours)")). - arg((1.0 / daynum) * (total_days - incompliant) * 100.0, 0, 'f', 2).arg(compliance_hours, 0, 'f', 1); - } - } - - //GetTextExtent(a,x,y); //legendx-=30+x; //w.renderText(a,px+24,py+5); diff --git a/oscar/SleepLib/profiles.h b/oscar/SleepLib/profiles.h index d6a169e9..1c5e80d5 100644 --- a/oscar/SleepLib/profiles.h +++ b/oscar/SleepLib/profiles.h @@ -309,7 +309,6 @@ const QString STR_OS_OxiDiscardThreshold = "OxiDiscardThreshold"; // CPAPSettings Strings const QString STR_CS_ComplianceHours = "ComplianceHours"; -const QString STR_CS_ShowCompliance = "ShowCompliance"; const QString STR_CS_ShowLeaksMode = "ShowLeaksMode"; const QString STR_CS_MaskStartDate = "MaskStartDate"; const QString STR_CS_MaskDescription = "MaskDescription"; @@ -560,7 +559,6 @@ class CPAPSettings : public PrefSettings : PrefSettings(profile) { m_complianceHours = initPref(STR_CS_ComplianceHours, 4.0f).toFloat(); - initPref(STR_CS_ShowCompliance, true); initPref(STR_CS_ShowLeaksMode, 0); // TODO: jedimark: Check if this date is initiliazed yet initPref(STR_CS_MaskStartDate, QDate()); @@ -597,7 +595,6 @@ class CPAPSettings : public PrefSettings //Getters double complianceHours() const { return m_complianceHours; } - bool showComplianceInfo() const { return getPref(STR_CS_ShowCompliance).toBool(); } 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(); } @@ -635,7 +632,6 @@ 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 setShowComplianceInfo(bool b) { setPref(STR_CS_ShowCompliance, b); } 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); } diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index 5c72104e..0962c9ab 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.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 + #include #include #include @@ -220,6 +223,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->includeSerial->setChecked(AppSetting->includeSerial()); ui->monochromePrinting->setChecked(AppSetting->monochromePrinting()); ui->clinicalMode->setChecked(AppSetting->clinicalMode()); + // clinicalMode and allowDisabledSessions are radio buttons and must be set to opposite values. Once clinicalMode is used. + // Radio Buttons illustrate the operating mode. + ui->allowDisabledSessions->setChecked(!AppSetting->clinicalMode()); ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport()); #ifndef NO_CHECKUPDATES @@ -262,7 +268,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->cacheSessionData->setChecked(AppSetting->cacheSessions()); ui->preloadSummaries->setChecked(profile->session->preloadSummaries()); ui->animationsAndTransitionsCheckbox->setChecked(AppSetting->animations()); - ui->complianceCheckBox->setChecked(profile->cpap->showComplianceInfo()); ui->complianceHours->setValue(profile->cpap->complianceHours()); ui->prefCalcMiddle->setCurrentIndex(profile->general->prefCalcMiddle()); @@ -858,7 +863,6 @@ bool PreferencesDialog::Save() profile->cpap->setShowLeakRedline(ui->showLeakRedline->isChecked()); profile->cpap->setLeakRedline(ui->leakRedlineSpinbox->value()); - profile->cpap->setShowComplianceInfo(ui->complianceCheckBox->isChecked()); profile->cpap->setComplianceHours(ui->complianceHours->value()); if (ui->graphHeight->value() != AppSetting->graphHeight()) { diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index 1b14f7b2..ffab3989 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -1201,13 +1201,6 @@ A value of 20% works well for detecting apneas. - - - - Compliance defined as - - - @@ -1285,31 +1278,6 @@ Defaults to 60 minutes.. Highly recommend it's left at this value. - - - - - 0 - 0 - - - - Regard days with under this usage as "incompliant". 4 hours is usually considered compliant. - - - hours - - - 1 - - - 8.000000000000000 - - - 4.000000000000000 - - - @@ -1513,6 +1481,172 @@ as this is the only value available on summary-only days. + + + Clinical + + + + 4 + + + 2 + + + 2 + + + 2 + + + 2 + + + false + + + + + true + + + Clinical Settings + + + false + + + + 4 + + + 8 + + + 4 + + + 4 + + + 5 + + + + + Compliance defined as + + + Regard days with under this usage as "incompliant". 4 hours is usually considered compliant. + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + false + + + + 0 + 0 + + + + Reset &Defaults + + + + + + + + 0 + 0 + + + + Select Oscar Operating Mode + + + + + + Clinical Mode + + + true + + + false + + + Clinical Mode does not allow disabled sessions.\nDisabled Session are not used for graphing or Statistics. + + + + + + + Allow Disabled Sessions + + + Clinical Mode does not allow disabled sessions.\nDisabled Session are not used for graphing or Statistics. + + + + + + + + + + Hours + + + 1 + + + 8.000000000000000 + + + 4.000000000000000 + + + + + + + + + + true + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Changing the Oscar Operating Mode requires a reload of the user's profile.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Data will be saved and restored.</p></body></html> + + + + + &Oximetry @@ -2756,16 +2890,6 @@ Try it and see if you like it. - - - - Clinical Mode does not allow disabled sessions.\nDisabled Session are not used for graphing or Statistics. - - - Clinical Mode - - -