Fix Statistics: Add configuration of alternating colored lines background

oscar/SleepLib/appsettings.cpp

@@ -35,6 +35,8 @@ AppWideSetting::AppWideSetting(Preferences *pref) : PrefSettings(pref)
     m_graphTooltips = initPref(STR_AS_GraphTooltips, true).toBool();
     m_usePixmapCaching = initPref(STR_AS_UsePixmapCaching, false).toBool();
     m_odt = (OverlayDisplayType)initPref(STR_AS_OverlayType, (int)ODT_Bars).toInt();
+    initPref(STR_AS_GraphTooltips, 0);
+    m_alternatingColorsCombo = initPref(STR_AS_setAlternatingColorsCombo, 0).toInt(); 
 #ifndef REMOVE_FITNESS
     m_olm = (OverviewLinechartModes)initPref(STR_AS_OverviewLinechartMode, (int)OLC_Bartop).toInt();
 #endif

oscar/SleepLib/appsettings.h

@@ -39,6 +39,7 @@ const QString STR_AS_ShowPieChart = "EnablePieChart";
 const QString STR_AS_Animations = "AnimationsAndTransitions";
 const QString STR_AS_SquareWave = "SquareWavePlots";
 const QString STR_AS_OverlayType = "OverlayType";
+const QString STR_AS_setAlternatingColorsCombo = "AlternatingColorsCombo";
 #ifndef REMOVE_FITNESS
 const QString STR_AS_OverviewLinechartMode = "OverviewLinechartMode";
 #endif
@@ -87,6 +88,7 @@ public:
   bool m_usePixmapCaching, m_antiAliasing, m_squareWavePlots,m_graphTooltips, m_lineCursorMode, m_animations;
   bool m_showPerformance, m_showDebug;
   int m_tooltipTimeout, m_graphHeight, m_scrollDampening;
+  int m_alternatingColorsCombo;
   bool m_multithreading, m_cacheSessions;
   float m_lineThickness;
 
@@ -142,6 +144,7 @@ public:
   //! \Allow disabling of sessions
   //! \brief Whether to show graph tooltips
   inline bool graphTooltips() const { return m_graphTooltips; }
+  inline int  alternatingColorsCombo() { return m_alternatingColorsCombo;}
   //! \brief Pen width of line plots
   inline float lineThickness() const { return m_lineThickness; }
   //! \brief Whether to show line cursor
@@ -203,6 +206,7 @@ public:
   //! \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)
+  void setAlternatingColorsCombo(int b) { setPref(STR_AS_setAlternatingColorsCombo, m_alternatingColorsCombo=b); }
 #ifndef REMOVE_FITNESS
   void setOverviewLinechartMode(OverviewLinechartModes olm) { setPref(STR_AS_OverviewLinechartMode, (int)(m_olm=olm)); }
 #endif

oscar/preferencesdialog.cpp

@@ -32,6 +32,7 @@
 #include "ui_preferencesdialog.h"
 #include "SleepLib/machine_common.h"
 #include "highresolution.h"
+#include "daily.h"
 
 extern QFont *defaultfont;
 extern QFont *mediumfont;
@@ -248,6 +249,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     // Radio Buttons illustrate the operating mode.
     ui->permissiveMode->setChecked(!profile->cpap->clinicalMode());
     HighResolution::checkBox(false,ui->highResolution);
+    ui->alternatingColorsCombo->setCurrentIndex(AppSetting->alternatingColorsCombo());
 
     ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport());
 #ifndef NO_CHECKUPDATES
@@ -864,6 +866,12 @@ bool PreferencesDialog::Save()
     p_profile->cpap->setClinicalMode(ui->clinicalMode->isChecked());
 
     HighResolution::checkBox(true,ui->highResolution);
+    
+    if (ui->alternatingColorsCombo->currentIndex() != AppSetting->alternatingColorsCombo()) {
+        AppSetting->setAlternatingColorsCombo(ui->alternatingColorsCombo->currentIndex());
+        mainwin->GenerateStatistics();
+    }
+
     AppSetting->setGraphTooltips(ui->graphTooltips->isChecked());
 
     AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked());

oscar/preferencesdialog.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>942</width>
-    <height>737</height>
+    <height>994</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -32,6 +32,9 @@
    <iconset resource="Resources.qrc">
     <normaloff>:/icons/preferences.png</normaloff>:/icons/preferences.png</iconset>
   </property>
+  <property name="styleSheet">
+   <string notr="true">&lt;string&gt;&quot;QGroupBox{ margin: 0px; padding: 0px; border: 1px solid gray; }&quot;&lt;/string&gt;</string>
+  </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
@@ -63,7 +66,7 @@
          </sizepolicy>
         </property>
         <property name="currentIndex">
-         <number>2</number>
+         <number>7</number>
         </property>
         <widget class="QWidget" name="importTab">
          <attribute name="title">
@@ -1073,9 +1076,6 @@ This option must be enabled before import, otherwise a purge is required.</strin
                   </font>
                  </property>
                  <property name="text">
-                  <!--
-				  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;Custom flagging is an experimental method of detecting events missed by the device. They are &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; text-decoration: underline;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt; included in AHI.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                  -->
                   <string>Custom flagging is an experimental method of detecting events missed by the device. They are not included in AHI. They are also displayed in the Statistics Tab using the Permissive mode (see Clinical tab).</string>
                  </property>
                  <property name="alignment">
@@ -2832,15 +2832,15 @@ Try it and see if you like it.</string>
                </item>
                <item>
                 <widget class="QCheckBox" name="usePixmapCaching">
+                 <property name="visible">
+                  <bool>false</bool>
+                 </property>
                  <property name="toolTip">
                   <string>Pixmap caching is an graphics acceleration technique. May cause problems with font drawing in graph display area on your platform.</string>
                  </property>
                  <property name="text">
                   <string>Use Pixmap Caching</string>
                  </property>
-                 <property name="visible" stdset="0">
-                  <bool>false</bool>
-                 </property>
                 </widget>
                </item>
                <item>
@@ -2849,7 +2849,7 @@ Try it and see if you like it.</string>
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;These features have recently been pruned. They will come back later. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                  <property name="text">
-                  <string>Animations  Fancy Stuff</string>
+                  <string>Animations &amp;&amp; Fancy Stuff</string>
                  </property>
                 </widget>
                </item>
@@ -2929,6 +2929,75 @@ Try it and see if you like it.</string>
               </layout>
              </widget>
             </item>
+            <item row="2" column="0">
+             <widget class="QGroupBox" name="groupBox_Statistics">
+              <property name="styleSheet">
+               <string notr="true">QGroupBox { margin: 0px;    padding: 0px;    border: none}</string>
+              </property>
+              <property name="title">
+               <string>Statistics</string>
+              </property>
+              <property name="leftMargin" stdset="0">
+               <number>0</number>
+              </property>
+              <property name="topMargin" stdset="0">
+               <number>0</number>
+              </property>
+              <property name="rightMargin" stdset="0">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" stdset="0">
+               <number>0</number>
+              </property>
+              <layout class="QGridLayout" name="gridLayout_Statisticss">
+               <item row="0" column="1">
+                <widget class="QComboBox" name="alternatingColorsCombo">
+                 <item>
+                  <property name="text">
+                   <string>Every 3rd Line</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Every 2nd Line</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Disabled</string>
+                  </property>
+                 </item>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QLabel" name="Label_47a">
+                 <property name="enabled">
+                  <bool>true</bool>
+                 </property>
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">QLabel{
+    margin: 0px;
+    padding: 0px;
+    border: none;
+}</string>
+                 </property>
+                 <property name="text">
+                  <string> Alternating Color Spacing</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
            </layout>
           </item>
           <item>

oscar/statistics.cpp

@@ -48,9 +48,22 @@ QString htmlMachines = "";          // Devices used in this profile
 QString htmlReportFooter = "";      // Page footer
 
 SummaryInfo summaryInfo;
+int alternatingModulo = 0;
+void  initAlternatingColor() {
+    DEBUGFC Q(alternatingModulo) ;
+    int alternateMode = AppSetting->alternatingColorsCombo();
+    DEBUGFC Q(alternatingModulo) ;
+    if (alternateMode==0) alternatingModulo=3;
+    else if (alternateMode==1) alternatingModulo=2;
+    else alternatingModulo = 0xffff;
+}
 QString alternatingColor(int& counter) {
+    if (alternatingModulo<=0) {
+        initAlternatingColor();
+    }
     counter++;
-    int offset = counter %= 3;
+    int offset = counter % alternatingModulo;
+    //DEBUGFC Q(alternatingModulo) Q(counter) Q(offset);
     if ( offset == 0) {
         //return "#d0ffd0";       // very lightgreen
         //return "#d8ffd8";       // very lightgreen
@@ -1308,6 +1321,7 @@ QString Statistics::getRDIorAHIText() {
 // Create the HTML for CPAP and Oximetry usage
 QString Statistics::GenerateCPAPUsage()
 {
+    
     summaryInfo.clear(p_profile->FirstDay(),p_profile->LastDay());
     QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
     QList<Machine *> oximeters = p_profile->GetMachines(MT_OXIMETER);
@@ -1565,6 +1579,8 @@ QString Statistics::GenerateCPAPUsage()
 // Create the HTML that will be the Statistics page.
 QString Statistics::GenerateHTML()
 {
+    DEBUGFC;
+    initAlternatingColor();
     htmlReportHeader = generateHeader(true);
     htmlReportHeaderPrint = generateHeader(false);
     htmlReportFooter = generateFooter(true);