diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 25e47171..f780927c 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -578,29 +578,7 @@ void Daily::showEvent(QShowEvent *) bool Daily::rejectToggleSessionEnable( Session*sess) { if (!sess) return true; - if (AppSetting->clinicalMode()) - { - #if 0 - QMessageBox mbox(QMessageBox::Warning, - tr("Disable Session"), i - tr(" Disabling Sessions is not valid in Compilance Mode"), - QMessageBox::Ok , this); - mbox.exec(); - #endif - return true; - } - bool enabled=sess->enabled(); - if (enabled ) { - QMessageBox mbox(QMessageBox::Warning, tr("Disable Session"), - tr("Disabling a session will remove this session \nfrom all graphs, reports and statistics." - "\n\n" - "The Search tab can find disabled sessions" - "\n\n" - "Continue to disable session?"), - QMessageBox::Yes | QMessageBox::No , this); - if (mbox.exec() != QMessageBox::Yes ) return true; - }; - sess->setEnabled(!enabled); + sess->setEnabled(!sess->enabled()); return false; } diff --git a/oscar/mainwindow.ui b/oscar/mainwindow.ui index 1e5540dd..3aaa03a0 100644 --- a/oscar/mainwindow.ui +++ b/oscar/mainwindow.ui @@ -2340,6 +2340,8 @@ hr { height: 1px; border-width: 0; } 0 + + &File diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index 0962c9ab..51c32ce5 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -223,9 +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. + // clinicalMode and permissiveMode 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->permissiveMode->setChecked(!AppSetting->clinicalMode()); ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport()); #ifndef NO_CHECKUPDATES diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index ffab3989..660c28ae 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -10,7 +10,7 @@ 0 0 942 - 726 + 737 @@ -63,7 +63,7 @@ - 1 + 2 @@ -1231,6 +1231,7 @@ Defaults to 60 minutes.. Highly recommend it's left at this value. + 50 false @@ -1533,12 +1534,12 @@ as this is the only value available on summary-only days. - - Compliance defined as - Regard days with under this usage as "incompliant". 4 hours is usually considered compliant. + + Compliance defined as + @@ -1584,6 +1585,9 @@ as this is the only value available on summary-only days. + + Clinical Mode does not allow disabled sessions.\nDisabled Session are not used for graphing or Statistics. + Clinical Mode @@ -1593,18 +1597,15 @@ as this is the only value available on summary-only days. 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. + permissive Mode allows disabled sessions.\nDisabled Session are used for graphing and Statistics. + + + Permissive Mode @@ -1640,8 +1641,18 @@ as this is the only value available on summary-only days. <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> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Clinical Mode: </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Reports what is on the data card, all of it including any and all data deselected in the Permissive mode. </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Basically replicates the reports and data stored on the devices data card. </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This includes pap devices, oximeters, etc. Compliance reports fall under this mode. </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Compliance reports always include all data within the chosen Compliance period, even if otherwise deselected.<br /><br />Permissive Mode:</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Allows user to select which data sets/ sessions to be used for calculations and display. </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Additional charts and calculations may be available that are not available from the vendor data. </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<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:</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Requires a reload of the user's profile. Data will be saved and restored.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> @@ -1742,12 +1753,12 @@ p, li { white-space: pre-wrap; } - - 150 - bpm + + 150 + @@ -1895,7 +1906,7 @@ p, li { white-space: pre-wrap; } - + @@ -1926,8 +1937,11 @@ p, li { white-space: pre-wrap; } - <html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;"> + <!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;"> </p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt; font-weight:600;">Syncing Oximetry and CPAP Data</span></p> <p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">CMS50 data imported from SpO2Review (from .spoR files) or the serial import method do </span><span style=" font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;">not</span><span style=" font-family:'Sans'; font-size:10pt;"> have the correct timestamp needed to sync.</span></p> <p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Live view mode (using a serial cable) is one way to acheive an accurate sync on CMS50 oximeters, but does not counter for CPAP clock drift.</span></p> @@ -2231,6 +2245,7 @@ Mainly affects the importer. + 50 false false false @@ -2948,6 +2963,7 @@ Try it and see if you like it. + 75 true @@ -2966,6 +2982,7 @@ Try it and see if you like it. + 75 true @@ -2984,6 +3001,7 @@ Try it and see if you like it. + 75 true @@ -3005,6 +3023,7 @@ Try it and see if you like it. + 75 true @@ -3270,6 +3289,7 @@ Try it and see if you like it. + 75 true diff --git a/oscar/sessionbar.cpp b/oscar/sessionbar.cpp index 6d859121..31474264 100644 --- a/oscar/sessionbar.cpp +++ b/oscar/sessionbar.cpp @@ -130,6 +130,7 @@ QColor brighten(QColor, float f); void SessionBar::mousePressEvent(QMouseEvent *ev) { + if ( AppSetting->clinicalMode() ) return; SegType mn = min(); SegType mx = max(); @@ -172,6 +173,7 @@ void SessionBar::mousePressEvent(QMouseEvent *ev) void SessionBar::mouseMoveEvent(QMouseEvent *ev) { + if ( AppSetting->clinicalMode() ) return; SegType mn = min(); SegType mx = max(); diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index f70488ea..7962f8e9 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -538,7 +538,7 @@ Statistics::Statistics(QObject *parent) : { rows.push_back(StatisticsRow(tr("CPAP Statistics"), SC_HEADING, MT_CPAP)); if (!AppSetting->clinicalMode()) - rows.push_back(StatisticsRow(tr("Warning: Disabled session data is excluded in this report"),SC_WARNING,MT_CPAP)); + rows.push_back(StatisticsRow(tr("Permissive Mode Warning: Disabled session data is excluded in this report"),SC_WARNING,MT_CPAP)); rows.push_back(StatisticsRow("", SC_DAYS, MT_CPAP)); rows.push_back(StatisticsRow("", SC_COLUMNHEADERS, MT_CPAP)); rows.push_back(StatisticsRow(tr("CPAP Usage"), SC_SUBHEADING, MT_CPAP));