Merge branch 'master' into prs1-older-cleanup

2025-04-05 10:40:42 +00:00 · 2019-10-25 21:39:39 -04:00 · 2019-10-25 21:39:39 -04:00 · 9771c75eec
commit 9771c75eec
parent d2764eb276 2e1069b8d0
12 changed files with 93 additions and 24 deletions
--- a/Building/Windows/BUILD-WIN.md
+++ b/Building/Windows/BUILD-WIN.md
@ -15,7 +15,7 @@ The following programs and files are required to create Windows installers:
    
 -   Gawk is required. You can use the version included with Git for Windows or install Gawk for Windows from <http://gnuwin32.sourceforge.net/packages/gawk.htm>. The deployment batch file will use the Git for Windows version if gawk.exe is not in your PATH.
    
-   QT Open Source edition from <https://www.qt.io/download>. I use version 5.12.4. More recent versions may also work but I have not tested any.
+-   QT Open Source edition from <https://www.qt.io/download>. I use version 5.12.5. More recent versions in the 5.12 series should also work.

 **Installing Inno Setup 6**

@ -59,7 +59,7 @@ Go to QT at <https://www.qt.io/download> and download the Open Source edition of
    
 -   Select components:

-    -   In QT 5.12.4:
+    -   In QT 5.12.5:

        -   MinGW 7.3.0 32-bit

@ -69,7 +69,7 @@ Go to QT at <https://www.qt.io/download> and download the Open Source edition of

    -   In Developer and Designer Tools:

-        -   QT Creator 4.10.0 CDB Debug (this may not be required)
+        -   QT Creator 4.10.0 CDB Debug

        -   MinGW 7.3.0 32-bit

--- a/Building/Windows/buildall.bat
+++ b/Building/Windows/buildall.bat
@ -1,7 +1,7 @@
 setlocal
 :::@echo off
 set qtpath=E:\Qt
-set qtVersion=5.12.4
+set qtVersion=5.12.5

 :::
 ::: Build 32- and 64-bit versions of OSCAR for Windows.
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@ -908,17 +908,23 @@ void Daily::ResetGraphLayout()
 {
    GraphView->resetLayout();
 }
-void Daily::ResetGraphOrder()
+void Daily::ResetGraphOrder(int type)
 {
-    Day * day = p_profile->GetDay(previous_date,MT_CPAP);
+    if (type == 0) {  // Auto order
+        Day * day = p_profile->GetDay(previous_date,MT_CPAP);

-    int cpapMode = day->getCPAPMode();
-//    qDebug() << "Daily::ResetGraphOrder cpapMode" << cpapMode;
+        int cpapMode = day->getCPAPMode();
+        //    qDebug() << "Daily::ResetGraphOrder cpapMode" << cpapMode;

-    if (useAdvancedGraphs.contains(cpapMode))
+        if (useAdvancedGraphs.contains(cpapMode))
+            GraphView->resetGraphOrder(true, advancedGraphOrder);
+        else
+            GraphView->resetGraphOrder(true, standardGraphOrder);
+    } else if (type == 2) { // Advanced order
        GraphView->resetGraphOrder(true, advancedGraphOrder);
-    else
+    } else {                // type == 1, standard order
        GraphView->resetGraphOrder(true, standardGraphOrder);
+    }

    // Enable all graphs (make them not hidden)
    for (int i=0;i<ui->graphCombo->count();i++) {
--- a/oscar/daily.h
+++ b/oscar/daily.h
@ -70,7 +70,7 @@ public:
    /*! \fn ResetGraphOrder()
        \brief Resets all graphs in the main gGraphView back to their initial order.
        */
-    void ResetGraphOrder();
+    void ResetGraphOrder(int type = 0);

    /*! \fn updateLeftSidebar()
        /brief Updtes left sidebar to reflect changes in pie chart visibility
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@ -1306,9 +1306,23 @@ void MainWindow::on_action_Reset_Graph_Layout_triggered()

 void MainWindow::on_action_Reset_Graph_Order_triggered()
 {
-    if (daily && (ui->tabWidget->currentWidget() == daily)) { daily->ResetGraphOrder(); }
+    if (daily && (ui->tabWidget->currentWidget() == daily)) { daily->ResetGraphOrder(0); }

-    if (overview && (ui->tabWidget->currentWidget() == overview)) { overview->ResetGraphOrder(); }
+    if (overview && (ui->tabWidget->currentWidget() == overview)) { overview->ResetGraphOrder(0); }
+}
+
+void MainWindow::on_action_Standard_Graph_Order_triggered()
+{
+    if (daily && (ui->tabWidget->currentWidget() == daily)) { daily->ResetGraphOrder(1); }
+
+    if (overview && (ui->tabWidget->currentWidget() == overview)) { overview->ResetGraphOrder(1); }
+}
+
+void MainWindow::on_action_Advanced_Graph_Order_triggered()
+{
+    if (daily && (ui->tabWidget->currentWidget() == daily)) { daily->ResetGraphOrder(2); }
+
+    if (overview && (ui->tabWidget->currentWidget() == overview)) { overview->ResetGraphOrder(2); }
 }

 void MainWindow::on_action_Preferences_triggered()
--- a/oscar/mainwindow.h
+++ b/oscar/mainwindow.h
@ -216,6 +216,12 @@ class MainWindow : public QMainWindow
    //! \brief passes the ResetGraphOrder menu click to the Daily & Overview views
    void on_action_Reset_Graph_Order_triggered();

+    //! \brief passes the ResetGraphOrder menu click to the Daily & Overview views
+    void on_action_Standard_Graph_Order_triggered();
+
+    //! \brief passes the ResetGraphOrder menu click to the Daily & Overview views
+    void on_action_Advanced_Graph_Order_triggered();
+
    //! \brief Opens the Preferences Dialog, and saving changes if OK is pressed
    void on_action_Preferences_triggered();

--- a/oscar/mainwindow.ui
+++ b/oscar/mainwindow.ui
@ -1211,7 +1211,7 @@ QToolBox::tab:selected  {
         <rect>
          <x>0</x>
          <y>0</y>
-          <width>175</width>
+          <width>174</width>
          <height>687</height>
         </rect>
        </property>
@ -1669,7 +1669,7 @@ border: 2px solid #56789a; border-radius: 30px;
         <rect>
          <x>0</x>
          <y>0</y>
-          <width>175</width>
+          <width>174</width>
          <height>687</height>
         </rect>
        </property>
@ -2714,7 +2714,7 @@ border-radius: 10px;
 &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:'MS Shell Dlg 2'; font-size:8.25pt; 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;/body&gt;&lt;/html&gt;</string>
+&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; font-family:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="openLinks">
            <bool>false</bool>
@ -2728,7 +2728,7 @@ p, li { white-space: pre-wrap; }
         <rect>
          <x>0</x>
          <y>0</y>
-          <width>175</width>
+          <width>174</width>
          <height>687</height>
         </rect>
        </property>
@ -2771,7 +2771,7 @@ p, li { white-space: pre-wrap; }
 &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:'MS Shell Dlg 2'; font-size:8.25pt; 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;/body&gt;&lt;/html&gt;</string>
+&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; font-family:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="openLinks">
            <bool>false</bool>
@ -2829,6 +2829,13 @@ p, li { white-space: pre-wrap; }
    <property name="title">
     <string>&amp;View</string>
    </property>
+    <widget class="QMenu" name="menu_Reset_Graphs">
+     <property name="title">
+      <string>&amp;Reset Graphs</string>
+     </property>
+     <addaction name="action_Standard_Graph_Order"/>
+     <addaction name="action_Advanced_Graph_Order"/>
+    </widget>
    <addaction name="actionView_Statistics"/>
    <addaction name="actionView_Daily"/>
    <addaction name="actionView_Overview"/>
@ -2836,7 +2843,7 @@ p, li { white-space: pre-wrap; }
    <addaction name="action_Fullscreen"/>
    <addaction name="action_Screenshot"/>
    <addaction name="separator"/>
-    <addaction name="action_Reset_Graph_Order"/>
+    <addaction name="menu_Reset_Graphs"/>
    <addaction name="action_Reset_Graph_Layout"/>
    <addaction name="separator"/>
    <addaction name="actionLine_Cursor"/>
@ -3231,12 +3238,20 @@ p, li { white-space: pre-wrap; }
    <string>Ctrl+P</string>
   </property>
  </action>
-  <action name="action_Reset_Graph_Order">
+  <action name="action_Standard_Graph_Order">
   <property name="text">
-    <string>&amp;Reset Graphs</string>
+    <string>Standard</string>
   </property>
   <property name="toolTip">
-    <string>Reset order of graphs page to initial order</string>
+    <string>Standard graph order, good for CPAP, APAP, Bi-Level</string>
+   </property>
+  </action>
+  <action name="action_Advanced_Graph_Order">
+   <property name="text">
+    <string>Advanced</string>
+   </property>
+   <property name="toolTip">
+    <string>Advanced graph order, good for ASV, AVAPS</string>
   </property>
  </action>
 </widget>
--- a/oscar/overview.cpp
+++ b/oscar/overview.cpp
@ -451,8 +451,9 @@ void Overview::ResetGraphLayout()
    GraphView->resetLayout();
 }

-void Overview::ResetGraphOrder()
+void Overview::ResetGraphOrder(int type)
 {
+    Q_UNUSED(type)
    GraphView->resetGraphOrder(false);
    ResetGraphLayout();
 }
--- a/oscar/overview.h
+++ b/oscar/overview.h
@ -58,7 +58,7 @@ class Overview : public QWidget
    /*! \fn ResetGraphOrder()
        \brief Resets all graphs in the main gGraphView back to their initial order.
        */
-    void ResetGraphOrder();
+    void ResetGraphOrder(int type);

    //! \brief Calls updateGL to redraw the overview charts
    void RedrawGraphs();
--- a/oscar/profileselector.cpp
+++ b/oscar/profileselector.cpp
@ -278,6 +278,12 @@ void ProfileSelector::on_profileFilter_textChanged(const QString &arg1)
    proxy->setFilterRegExp(regExp);
 }

+// Clear filter list
+void ProfileSelector::on_resetFilterButton_clicked()
+{
+    ui->profileFilter->clear();
+}
+
 void ProfileSelector::on_buttonOpenProfile_clicked()
 {
    if (ui->profileView->currentIndex().isValid()) {
--- a/oscar/profileselector.h
+++ b/oscar/profileselector.h
@ -57,6 +57,8 @@ private slots:

    void on_selectionChanged(const QModelIndex &current, const QModelIndex &previous);

+    void on_resetFilterButton_clicked();
+
 private:
    QString getProfileDiskInfo(Profile *profile);
    QString formatSize(qint64 size);
--- a/oscar/profileselector.ui
+++ b/oscar/profileselector.ui
@ -32,6 +32,25 @@
         </item>
         <item>
          <widget class="QToolButton" name="resetFilterButton">
+           <property name="toolTip">
+            <string>Reset filter to see all profiles</string>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">QToolButton {
+ background: transparent;
+ border-radius: 8px;
+ border: 2px solid transparent;
+}
+
+QToolButton:hover {
+ border: 2px solid #456789;
+}
+
+QToolButton:pressed {
+ border: 2px solid #456789;
+ background-color: #89abcd;
+}</string>
+           </property>
           <property name="text">
            <string>...</string>
           </property>