Merge branch 'master' into fix-png-profile

oscar/SleepLib/appsettings.h

@@ -28,7 +28,8 @@ const QString STR_AS_GraphHeight = "GraphHeight";
 const QString STR_AS_DailyPanelWidth = "DailyPanelWidth";
 const QString STR_AS_RightPanelWidth = "RightPanelWidth";
 const QString STR_AS_AntiAliasing = "UseAntiAliasing";
-const QString STR_AS_GraphSnapshots = "EnableGraphSnapshots";
+const QString STR_AS_GraphSnapshots = "EnableGraphSnapshots";  // Obsolete, replaced by ShowPieChart
+const QString STR_AS_ShowPieChart = "EnablePieChart";
 const QString STR_AS_Animations = "AnimationsAndTransitions";
 const QString STR_AS_SquareWave = "SquareWavePlots";
 const QString STR_AS_OverlayType = "OverlayType";
@@ -80,7 +81,8 @@ public:
       initPref(STR_AS_DailyPanelWidth, 250.0);
       initPref(STR_AS_RightPanelWidth, 230.0);
       m_antiAliasing=initPref(STR_AS_AntiAliasing, true).toBool();
-      initPref(STR_AS_GraphSnapshots, true);
+//      initPref(STR_AS_GraphSnapshots, true);
+      initPref(STR_AS_ShowPieChart, false);
       m_animations = initPref(STR_AS_Animations, true).toBool();
       m_squareWavePlots = initPref(STR_AS_SquareWave, false).toBool();
       initPref(STR_AS_AllowYAxisScaling, true);
@@ -151,7 +153,7 @@ public:
   //! \brief Returns true if AntiAliasing (the graphical smoothing method) is enabled
   inline bool antiAliasing() const { return m_antiAliasing; }
   //! \brief Returns true if renderPixmap function is in use, which takes snapshots of graphs
-  bool graphSnapshots() const { return getPref(STR_AS_GraphSnapshots).toBool(); }
+  bool showPieChart() const { return getPref(STR_AS_ShowPieChart).toBool(); }
   //! \brief Returns true if Graphical animations & Transitions will be drawn
   bool animations() const { return m_animations; }
   //! \brief Returns true if PixmapCaching acceleration will be used
@@ -200,7 +202,7 @@ public:
   //! \brief Set to true to turn on AntiAliasing (the graphical smoothing method)
   void setAntiAliasing(bool aa) { setPref(STR_AS_AntiAliasing, m_antiAliasing=aa); }
   //! \brief Set to true if renderPixmap functions are in use, which takes snapshots of graphs.
-  void setGraphSnapshots(bool gs) { setPref(STR_AS_GraphSnapshots, gs); }
+  void setShowPieChart(bool gs) { setPref(STR_AS_ShowPieChart, gs); }
   //! \brief Set to true if Graphical animations & Transitions will be drawn
   void setAnimations(bool anim) { setPref(STR_AS_Animations, m_animations=anim); }
   //! \brief Set to true to use Pixmap Caching of Text and other graphics caching speedup techniques

oscar/SleepLib/preferences.h

@@ -86,6 +86,15 @@ class Preferences
         }
     }
 
+    //! \brief Rename a preference
+    void Rename (QString oldname, QString newname) {
+        if (contains(oldname)) {
+            QVariant val = Get(oldname);
+            Set(newname, val);
+            Erase(oldname);
+        }
+    }
+
     //! \brief Opens, processes the XML for this Preferences group, loading all preferences stored therein.
     //! \note If filename is empty, it will use the one specified in the constructor
     //! \returns true if succesful

oscar/SleepLib/session.cpp

@@ -620,6 +620,9 @@ bool Session::LoadSummary()
         }
         if (version >= 18) {
             in >> s_noSettings;
+//            qDebug() << "Session::LoadSummary" << s_session << "["
+//                     << QDateTime::fromTime_t(s_session).toString("MM/dd/yyyy hh:mm:ss")
+//                     << "] s_noSettings" << s_noSettings << "size" << settings.size();
         } else {
             s_noSettings = (settings.size() == 0);
         }

oscar/daily.cpp

@@ -179,9 +179,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     SF->setPinned(true);
 
     ChannelID cpapcodes[] = {
-        CPAP_FlowRate, CPAP_MaskPressure, CPAP_Pressure, CPAP_Leak, CPAP_Snore,  CPAP_FLG, CPAP_RespRate,
+        CPAP_FlowRate, CPAP_Pressure, CPAP_Leak, CPAP_FLG, CPAP_Snore, CPAP_TidalVolume,
-        CPAP_TidalVolume, CPAP_MinuteVent,CPAP_PTB, CPAP_RespEvent, CPAP_Ti, CPAP_Te,
+        CPAP_MaskPressure, CPAP_RespRate, CPAP_MinuteVent, CPAP_PTB, CPAP_RespEvent, CPAP_Ti, CPAP_Te,
-      /*  CPAP_IE, */   ZEO_SleepStage, POS_Inclination, POS_Orientation, CPAP_Test1
+        /*  CPAP_IE, */   ZEO_SleepStage, POS_Inclination, POS_Orientation, CPAP_Test1
     };
 
     int cpapsize = sizeof(cpapcodes) / sizeof(ChannelID);
@@ -1477,7 +1477,7 @@ void Daily::Load(QDate date)
 
             html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
             // Show Event Breakdown pie chart
-            if ((hours > 0) && AppSetting->graphSnapshots()) {  // AHI Pie Chart
+            if ((hours > 0) && AppSetting->showPieChart()) {  // AHI Pie Chart
                 if ((values[CPAP_Obstructive] + values[CPAP_Hypopnea] + values[CPAP_ClearAirway] + values[CPAP_Apnea] + values[CPAP_RERA] + values[CPAP_FlowLimit] + values[CPAP_SensAwake])>0) {
                     html+="<tr><td align=center>&nbsp;</td></tr>";
                     html+=QString("<tr><td align=center><b>%1</b></td></tr>").arg(tr("Event Breakdown"));

oscar/main.cpp

@@ -493,7 +493,7 @@ int main(int argc, char *argv[]) {
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Initialize preferences system (Don't use p_pref before this point)
+    // Initialize preferences system (Don't use p_pref before this point!)
     ///////////////////////////////////////////////////////////////////////////////////////////
     p_pref = new Preferences("Preferences");
     p_pref->Open();
@@ -506,11 +506,8 @@ int main(int argc, char *argv[]) {
     validateAllFonts();
     setApplicationFont();
 
-//    Clean up some legacy crap
+    // one-time translate GraphSnapshots to ShowPieChart
-//    QFile lf(p_pref->Get("{home}/Layout.xml"));
+    p_pref->Rename(STR_AS_GraphSnapshots, STR_AS_ShowPieChart);
-//    if (lf.exists()) {
-//        lf.remove();
-//    }
 
     p_pref->Erase(STR_AppName);
     p_pref->Erase(STR_GEN_SkipLogin);

oscar/mainwindow.cpp

@@ -122,7 +122,8 @@ void MainWindow::SetupGUI()
     ui->action_Preferences->setShortcuts(QKeySequence::Preferences);
 #endif
 
-    ui->actionToggle_Line_Cursor->setChecked(AppSetting->lineCursorMode());
+    ui->actionLine_Cursor->setChecked(AppSetting->lineCursorMode());
+    ui->actionPie_Chart->setChecked(AppSetting->showPieChart());
     ui->actionDebug->setChecked(AppSetting->showDebug());
     ui->actionShow_Performance_Counters->setChecked(AppSetting->showPerformance());
 
@@ -210,6 +211,10 @@ void MainWindow::SetupGUI()
     ui->action_Sidebar_Toggle->setChecked(b);
     ui->toolBox->setVisible(b);
 
+    ui->actionPie_Chart->setChecked(AppSetting->showPieChart());
+
+    ui->actionDaily_Calendar->setChecked(AppSetting->calendarVisible());
+
     on_tabWidget_currentChanged(0);
 
 #ifndef REMSTAR_M_SUPPORT
@@ -2451,7 +2456,7 @@ void MainWindow::on_importButton_clicked()
 }
 
 
-void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b)
+void MainWindow::on_actionLine_Cursor_toggled(bool b)
 {
     AppSetting->setLineCursorMode(b);
     if (ui->tabWidget->currentWidget() == daily) {
@@ -2461,6 +2466,14 @@ void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b)
     }
 }
 
+void MainWindow::on_actionPie_Chart_toggled(bool visible)
+{
+    AppSetting->setShowPieChart(visible);
+    if (daily && ui->tabWidget->currentWidget() == daily) {
+        daily->ReloadGraphs();
+    }
+}
+
 void MainWindow::on_actionLeft_Daily_Sidebar_toggled(bool visible)
 {
     if (daily) daily->setSidebarVisible(visible);

oscar/mainwindow.h

@@ -305,12 +305,14 @@ class MainWindow : public QMainWindow
 
     void on_importButton_clicked();
 
-    void on_actionToggle_Line_Cursor_toggled(bool arg1);
+    void on_actionLine_Cursor_toggled(bool arg1);
 
     void on_actionLeft_Daily_Sidebar_toggled(bool arg1);
 
     void on_actionDaily_Calendar_toggled(bool arg1);
 
+    void on_actionPie_Chart_toggled(bool arg1);
+
     void on_actionExport_Journal_triggered();
 
     void on_actionShow_Performance_Counters_toggled(bool arg1);

oscar/mainwindow.ui

@@ -2838,7 +2838,8 @@ p, li { white-space: pre-wrap; }
     <addaction name="separator"/>
     <addaction name="action_Reset_Graph_Layout"/>
     <addaction name="separator"/>
-    <addaction name="actionToggle_Line_Cursor"/>
+    <addaction name="actionLine_Cursor"/>
+    <addaction name="actionPie_Chart"/>
     <addaction name="actionLeft_Daily_Sidebar"/>
     <addaction name="actionDaily_Calendar"/>
     <addaction name="action_Sidebar_Toggle"/>
@@ -2932,6 +2933,9 @@ p, li { white-space: pre-wrap; }
    <property name="text">
     <string>View &amp;Daily</string>
    </property>
+   <property name="toolTip">
+    <string>Show Daily view</string>
+   </property>
    <property name="shortcut">
     <string notr="true">F5</string>
    </property>
@@ -2940,6 +2944,9 @@ p, li { white-space: pre-wrap; }
    <property name="text">
     <string>View &amp;Overview</string>
    </property>
+   <property name="toolTip">
+    <string>Show Overview view</string>
+   </property>
    <property name="shortcut">
     <string notr="true">F6</string>
    </property>
@@ -2980,6 +2987,9 @@ p, li { white-space: pre-wrap; }
    <property name="text">
     <string>&amp;Maximize Toggle</string>
    </property>
+   <property name="toolTip">
+    <string>Maximize window</string>
+   </property>
    <property name="shortcut">
     <string notr="true">F11</string>
    </property>
@@ -2999,6 +3009,9 @@ p, li { white-space: pre-wrap; }
    <property name="text">
     <string>&amp;Reset Graph Layout</string>
    </property>
+   <property name="toolTip">
+    <string>Reset sizes of graphs</string>
+   </property>
   </action>
   <action name="action_Screenshot">
    <property name="text">
@@ -3061,6 +3074,9 @@ p, li { white-space: pre-wrap; }
    <property name="text">
     <string>Right &amp;Sidebar</string>
    </property>
+   <property name="toolTip">
+    <string>Show Right Sidebar</string>
+   </property>
    <property name="shortcut">
     <string notr="true">F10</string>
    </property>
@@ -3073,7 +3089,7 @@ p, li { white-space: pre-wrap; }
     <string>View Statistics</string>
    </property>
    <property name="toolTip">
-    <string>View Statistics</string>
+    <string>Show Statistics view</string>
    </property>
    <property name="shortcut">
     <string notr="true">F4</string>
@@ -3114,7 +3130,7 @@ p, li { white-space: pre-wrap; }
     <string>Current Days</string>
    </property>
   </action>
-  <action name="actionToggle_Line_Cursor">
+  <action name="actionLine_Cursor">
    <property name="checkable">
     <bool>true</bool>
    </property>
@@ -3140,6 +3156,9 @@ p, li { white-space: pre-wrap; }
    <property name="text">
     <string>Daily Sidebar</string>
    </property>
+   <property name="toolTip">
+    <string>Show Daily Left Sidebar</string>
+   </property>
    <property name="shortcut">
     <string notr="true">F8</string>
    </property>
@@ -3154,6 +3173,9 @@ p, li { white-space: pre-wrap; }
    <property name="text">
     <string>Daily Calendar</string>
    </property>
+   <property name="toolTip">
+    <string>Show Daily Calendar</string>
+   </property>
    <property name="shortcut">
     <string notr="true">F9</string>
    </property>
@@ -3191,6 +3213,23 @@ p, li { white-space: pre-wrap; }
     <string>System Information</string>
    </property>
   </action>
+  <action name="actionPie_Chart">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Toggle &amp;Pie Chart</string>
+   </property>
+   <property name="toolTip">
+    <string>Show Pie Chart on Daily page</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+P</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

oscar/preferencesdialog.cpp

@@ -210,7 +210,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     ui->useAntiAliasing->setChecked(AppSetting->antiAliasing());
     ui->usePixmapCaching->setChecked(AppSetting->usePixmapCaching());
     ui->useSquareWavePlots->setChecked(AppSetting->squareWavePlots());
-    ui->enableGraphSnapshots->setChecked(AppSetting->graphSnapshots());
+//    ui->enableGraphSnapshots->setChecked(AppSetting->graphSnapshots());
     ui->graphTooltips->setChecked(AppSetting->graphTooltips());
     ui->allowYAxisScaling->setChecked(AppSetting->allowYAxisScaling());
 
@@ -808,7 +808,7 @@ bool PreferencesDialog::Save()
     AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked());
     AppSetting->setUsePixmapCaching(ui->usePixmapCaching->isChecked());
     AppSetting->setSquareWavePlots(ui->useSquareWavePlots->isChecked());
-    AppSetting->setGraphSnapshots(ui->enableGraphSnapshots->isChecked());
+//    AppSetting->setGraphSnapshots(ui->enableGraphSnapshots->isChecked());
     AppSetting->setLineThickness(float(ui->lineThicknessSlider->value()) / 2.0);
 
     profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked());

oscar/preferencesdialog.ui

@@ -57,7 +57,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="importTab">
       <attribute name="title">
@@ -2651,20 +2651,6 @@ Try it and see if you like it.</string>
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="QCheckBox" name="enableGraphSnapshots">
-              <property name="toolTip">
-               <string>Allows graphs to be &quot;screenshotted&quot; for display purposes.
-The Event Breakdown PIE chart uses this method, as does
-the printing code.
-Unfortunately some older computers/versions of Qt can cause
-this application to be unstable with this feature enabled.</string>
-              </property>
-              <property name="text">
-               <string>Show event breakdown pie chart</string>
-              </property>
-             </widget>
-            </item>
             <item>
              <widget class="QCheckBox" name="usePixmapCaching">
               <property name="toolTip">

oscar/welcome.cpp

@@ -68,6 +68,13 @@ void Welcome::refreshPage()
     ui->oximetryButton->setEnabled(b);  // looks like this was omitted from the list (gts 7/4/2019)
     ui->overviewButton->setEnabled(b);
     ui->statisticsButton->setEnabled(b);
+
+    ui->importButton->repaint();
+    ui->dailyButton->repaint();
+    ui->overviewButton->repaint();
+    ui->statisticsButton->repaint();
+    ui->oximetryButton->repaint();
+
     mainwin->EnableTabs(b);
 
 /** MainWindow::ui->tabWidget->setTabEnabled(2, b);********* need to find some other way