From ff37ac069548222b9ddbc7a99dc506bf4df5133e Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Sat, 31 Aug 2019 17:06:47 -0700
Subject: [PATCH] Add preferences setting to include machine serial on
 Statistics page machine settings report, default to off because it is ugly.

---
 oscar/SleepLib/appsettings.h |  6 ++++++
 oscar/preferencesdialog.cpp  |  2 ++
 oscar/preferencesdialog.ui   | 12 +++++++++++-
 oscar/statistics.cpp         |  9 ++++++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/oscar/SleepLib/appsettings.h b/oscar/SleepLib/appsettings.h
index 56cff254..9ba292d4 100644
--- a/oscar/SleepLib/appsettings.h
+++ b/oscar/SleepLib/appsettings.h
@@ -36,6 +36,7 @@ const QString STR_AS_OverlayType = "OverlayType";
 const QString STR_AS_OverviewLinechartMode = "OverviewLinechartMode";
 const QString STR_AS_UsePixmapCaching = "UsePixmapCaching";
 const QString STR_AS_AllowYAxisScaling = "AllowYAxisScaling";
+const QString STR_AS_IncludeSerial = "IncludeSerial";
 const QString STR_AS_GraphTooltips = "GraphTooltips";
 const QString STR_AS_LineThickness = "LineThickness";
 const QString STR_AS_LineCursorMode = "LineCursorMode";
@@ -82,6 +83,7 @@ public:
       initPref(STR_AS_RightPanelWidth, 230.0);
       m_antiAliasing=initPref(STR_AS_AntiAliasing, true).toBool();
 //      initPref(STR_AS_GraphSnapshots, true);
+      initPref(STR_AS_IncludeSerial, false);
       initPref(STR_AS_ShowPieChart, false);
       m_animations = initPref(STR_AS_Animations, true).toBool();
       m_squareWavePlots = initPref(STR_AS_SquareWave, false).toBool();
@@ -162,6 +164,8 @@ public:
   inline bool squareWavePlots() const { return m_squareWavePlots; }
   //! \brief Whether to allow double clicking on Y-Axis labels to change vertical scaling mode
   bool allowYAxisScaling() const { return getPref(STR_AS_AllowYAxisScaling).toBool(); }
+  //! \brief Whether to include serial number in machine settings changes report
+  bool includeSerial() const { return getPref(STR_AS_IncludeSerial).toBool(); }
   //! \brief Whether to show graph tooltips
   inline bool graphTooltips() const { return m_graphTooltips; }
   //! \brief Pen width of line plots
@@ -213,6 +217,8 @@ public:
   void setOverlayType(OverlayDisplayType odt) { setPref(STR_AS_OverlayType, (int)(m_odt=odt)); }
   //! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
   void setAllowYAxisScaling(bool b) { setPref(STR_AS_AllowYAxisScaling, b); }
+  //! \brief Sets whether to include machine serial number on machine settings report
+  void setIncludeSerial(bool b) { setPref(STR_AS_IncludeSerial, 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)
diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp
index 5eef3b11..54a1154f 100644
--- a/oscar/preferencesdialog.cpp
+++ b/oscar/preferencesdialog.cpp
@@ -213,6 +213,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
 //    ui->enableGraphSnapshots->setChecked(AppSetting->graphSnapshots());
     ui->graphTooltips->setChecked(AppSetting->graphTooltips());
     ui->allowYAxisScaling->setChecked(AppSetting->allowYAxisScaling());
+    ui->includeSerial->setChecked(AppSetting->includeSerial());
 
     ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport());
 #ifndef NO_UPDATER
@@ -803,6 +804,7 @@ bool PreferencesDialog::Save()
     AppSetting->setOpenTabAfterImport(ui->importTabCombo->currentIndex());
 
     AppSetting->setAllowYAxisScaling(ui->allowYAxisScaling->isChecked());
+    AppSetting->setIncludeSerial(ui->includeSerial->isChecked());
     AppSetting->setGraphTooltips(ui->graphTooltips->isChecked());
 
     AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked());
diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui
index 892b5a0c..bf5b6dcf 100644
--- a/oscar/preferencesdialog.ui
+++ b/oscar/preferencesdialog.ui
@@ -57,7 +57,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>6</number>
      </property>
      <widget class="QWidget" name="importTab">
       <attribute name="title">
@@ -2691,6 +2691,16 @@ Try it and see if you like it.</string>
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QCheckBox" name="includeSerial">
+              <property name="toolTip">
+               <string>Whether to include machine serial number on machine settings changes report</string>
+              </property>
+              <property name="text">
+               <string>Include Serial Number</string>
+              </property>
+             </widget>
+            </item>
             <item>
              <spacer name="verticalSpacer">
               <property name="orientation">
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 765bc959..867ba34b 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -991,12 +991,19 @@ QString Statistics::GenerateRXChanges()
         double ahi = rdi ? (double(rx.rdi) / rx.hours) : (double(rx.ahi) /rx.hours);
         double fli = double(rx.count(CPAP_FlowLimit)) / rx. hours;
 
+        QString machid = QString("<td>%1 (%2)</td>").arg(rx.machine->model())
+                                                       .arg(rx.machine->modelnumber());
+        if (AppSetting->includeSerial())
+            machid = QString("<td>%1 (%2) [%3]</td>").arg(rx.machine->model())
+                                                           .arg(rx.machine->modelnumber())
+                                                           .arg(rx.machine->serial());
+
         html += QString("<td>%1</td>").arg(rx.start.toString(MedDateFormat))+
                 QString("<td>%1</td>").arg(rx.end.toString(MedDateFormat))+
                 QString("<td>%1</td>").arg(rx.days)+
                 QString("<td>%1</td>").arg(ahi, 0, 'f', 2)+
                 QString("<td>%1</td>").arg(fli, 0, 'f', 2)+
-                QString("<td>%1 (%2)</td>").arg(rx.machine->model()).arg(rx.machine->modelnumber())+
+                machid +
                 QString("<td>%1</td>").arg(formatRelief(rx.relief))+
                 QString("<td>%1</td>").arg(rx.mode)+
                 QString("<td>%1</td>").arg(rx.pressure)+