diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 7a4f00bb..b1781d96 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -579,7 +579,7 @@ void Daily::showEvent(QShowEvent *) bool Daily::rejectToggleSessionEnable( Session*sess) { if (!sess) return true; if (AppSetting->clinicalMode()) { - QMessageBox mbox(QMessageBox::Warning, tr("Disable Session"), tr(" Disabling Sessions requires the Permissive Mode"), QMessageBox::Ok , this); + QMessageBox mbox(QMessageBox::Warning, tr("Clinical Mode"), tr(" Disabling Sessions requires the Permissive Mode"), QMessageBox::Ok , this); mbox.exec(); return true; } diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index 51c32ce5..a160db97 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -42,6 +42,25 @@ typedef QMessageBox::StandardButtons StandardButtons; QHash channeltype; + +QString PreferencesDialog::clinicalHelp() { + QStringList str; str + <includeSerial->setChecked(AppSetting->includeSerial()); ui->monochromePrinting->setChecked(AppSetting->monochromePrinting()); ui->clinicalMode->setChecked(AppSetting->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()); diff --git a/oscar/preferencesdialog.h b/oscar/preferencesdialog.h index 89fdce2e..a9a82285 100644 --- a/oscar/preferencesdialog.h +++ b/oscar/preferencesdialog.h @@ -16,6 +16,7 @@ #include #include #include +#include #include "SleepLib/profiles.h" namespace Ui { @@ -53,6 +54,7 @@ class PreferencesDialog : public QDialog //! \brief Save the current preferences, called when Ok button is clicked on. bool Save(); + QString clinicalHelp(); #ifndef NO_CHECKUPDATES //! \brief Updates the date text of the last time updates where checked void RefreshLastChecked(); diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index 15de335f..243c2512 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -1632,28 +1632,10 @@ as this is the only value available on summary-only days. - + 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="-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> - diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index 722e1219..e3e568f0 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -245,7 +245,9 @@ Duration of longest disabled session: aa minutes, Total duration of all disabled switch (type) { default : case 0: - return QString(QObject::tr("Permissive mode is set (Preferences/Clinical), disabled sessions are excluded from this report")); + //return QString(QObject::tr("Permissive mode is set (Preferences/Clinical), disabled sessions are excluded from this report")); + //return QString(QObject::tr("Permissive mode allows disabled sessions")); + return QString(QObject::tr("Permissive Mode")); case 1: if (numDisabledsessions>0) { return QString(QObject::tr("Total disabled sessions: %1, found in %2 days") .arg(numDisabledsessions) .arg(numDaysWithDisabledsessions)); @@ -254,8 +256,7 @@ Duration of longest disabled session: aa minutes, Total duration of all disabled } case 2: return QString(QObject::tr( "Duration of longest disabled session: %1 minutes, Total duration of all disabled sessions: %2 minutes.") - .arg(maxDurationOfaDisabledsession) - .arg(totalDurationOfDisabledSessions)); + .arg(maxDurationOfaDisabledsession) .arg(totalDurationOfDisabledSessions)); } }