Update again to complete current request UI changes.

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;
     }

oscar/preferencesdialog.cpp

@@ -42,6 +42,25 @@ typedef QMessageBox::StandardButtons StandardButtons;
 
 QHash<schema::ChanType, QString> channeltype;
 
+
+QString PreferencesDialog::clinicalHelp() {
+    QStringList str; str
+    <<tr("Clinical Mode:")
+    <<tr("Reports what is on the data card, all of it including any and all data deselected in the Permissive mode.")
+    <<tr("Basically replicates the reports and data stored on the devices data card.")
+    <<tr("This includes pap devices, oximeters, etc. Compliance reports fall under this mode.")
+    <<tr("Compliance reports always include all data within the chosen Compliance period, even if otherwise deselected.")
+    <<""
+    <<tr("Permissive Mode:")
+    <<tr("Allows user to select which data sets/ sessions to be used for calculations and display.")
+    <<tr("Additional charts and calculations may be available that are not available from the vendor data.")
+    <<""
+    <<tr("Changing the Oscar Operating Mode:")
+    <<tr("Requires a reload of the user's profile. Data will be saved and restored.")
+    <<"";
+    return str.join("\n");
+}
+
 PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint),
     ui(new Ui::PreferencesDialog),
@@ -223,6 +242,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     ui->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());

oscar/preferencesdialog.h

@@ -16,6 +16,7 @@
 #include <QStringListModel>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
+#include <QTextEdit>
 #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();

oscar/preferencesdialog.ui

@@ -1632,28 +1632,10 @@ as this is the only value available on summary-only days.</string>
            </widget>
           </item>
           <item>
-           <widget class="QTextEdit" name="textEdit">
+           <widget class="QTextEdit" name="clinicalTextEdit">
             <property name="readOnly">
              <bool>true</bool>
             </property>
-            <property name="html">
-             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Clinical Mode: &lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Reports what is on the data card, all of it including any and all data deselected in the Permissive mode. &lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Basically replicates the reports and data stored on the devices data card. &lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This includes pap devices, oximeters, etc. Compliance reports fall under this mode. &lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Compliance reports always include all data within the chosen Compliance period, even if otherwise deselected.&lt;br /&gt;&lt;br /&gt;Permissive Mode:&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Allows user to select which data sets/ sessions to be used for calculations and display. &lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Additional charts and calculations may be available that are not available from the vendor data. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Changing the Oscar Operating Mode:&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Requires a reload of the user's profile. Data will be saved and restored.&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
            </widget>
           </item>
          </layout>

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(maxDurationOfaDisabledsession) .arg(totalDurationOfDisabledSessions));
-                .arg(totalDurationOfDisabledSessions));
     }
 }