Add View/Reset Graphs to put graphs in original order and heights. Overlays and dotted lines are not yet reset.

oscar/Graphs/gGraphView.cpp

@@ -3287,6 +3287,14 @@ void gGraphView::timedRedraw(int ms)
     timer->setSingleShot(true);
     timer->start(ms);
 }
+
+void gGraphView::deselect()
+{
+    for (auto & graph : m_graphs) {
+        if (graph) graph->deselect();
+    }
+}
+
 void gGraphView::resetLayout()
 {
     int default_height = AppSetting->graphHeight();
@@ -3298,11 +3306,13 @@ void gGraphView::resetLayout()
     updateScale();
     timedRedraw(0);
 }
-void gGraphView::deselect()
-{
-    for (auto & graph : m_graphs) {
-        if (graph) graph->deselect();
-    }
+// Reset order of current graphs to match defaults
+void gGraphView::resetGraphOrder() {
+   m_graphs = m_default_graphs;
+}
+
+void gGraphView::SaveDefaultSettings() {
+    m_default_graphs = m_graphs;
 }
 
 const quint32 gvmagic = 0x41756728;

oscar/Graphs/gGraphView.h

@@ -373,6 +373,12 @@ class gGraphView
     //! \brief Loads the current graph order, heights, min & max Y values from disk
     bool LoadSettings(QString title);
 
+    //! \brief Saves the current (initial) graph order, heights, min & Max Y values for future recovery
+    void SaveDefaultSettings();
+
+    //! \brief Reset the current graph order, heights, min & max Y values to match default values
+    void resetGraphOrder();
+
     //! \brief Returns the graph object matching the supplied name, nullptr if it does not exist.
     gGraph *findGraph(QString name);
 
@@ -606,6 +612,9 @@ class gGraphView
     //! \brief List of all graphs contained, indexed by title
     QHash<QString, gGraph *> m_graphsbyname;
 
+    //! \brief List of initial settings of all graphs contained in this area
+    QList<gGraph *> m_default_graphs;
+
     //! \variable Vertical scroll offset (adjusted when scrollbar gets moved)
     int m_offsetY;
     //! \variable Horizontal scroll offset (unused, but can be made to work if necessary)

oscar/daily.cpp

@@ -200,20 +200,20 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
 
     int cpapsize = sizeof(cpapcodes) / sizeof(ChannelID);
 
-    ChannelID oxicodes[] = {
-        OXI_Pulse, OXI_SPO2, OXI_Perf, OXI_Plethy
-    };
-    int oxisize = sizeof(oxicodes) / sizeof(ChannelID);
-
-
     for (int i=0; i < cpapsize; ++i) {
         ChannelID code = cpapcodes[i];
         graphlist[schema::channel[code].code()] = new gGraph(schema::channel[code].code(), GraphView, schema::channel[code].label(), channelInfo(code), default_height);
     }
 
+    ChannelID oximetercodes[] = {
+        OXI_Pulse, OXI_SPO2, OXI_Perf, OXI_Plethy
+    };
+
+    int oxisize = sizeof(oximetercodes) / sizeof(ChannelID);
+
     //int oxigrp=p_profile->ExistsAndTrue("SyncOximetry") ? 0 : 1; // Contemplating killing this setting...
     for (int i=0; i < oxisize; ++i) {
-        ChannelID code = oxicodes[i];
+        ChannelID code = oximetercodes[i];
         graphlist[schema::channel[code].code()] = new gGraph(schema::channel[code].code(), GraphView, schema::channel[code].label(), channelInfo(code), default_height);
     }
 
@@ -444,6 +444,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     on_calButton_toggled(AppSetting->calendarVisible());
 
     GraphView->resetLayout();
+    GraphView->SaveDefaultSettings();
     GraphView->LoadSettings("Daily");
 
     connect(GraphView, SIGNAL(updateCurrentTime(double)), this, SLOT(on_LineCursorUpdate(double)));
@@ -848,6 +849,12 @@ void Daily::ResetGraphLayout()
 {
     GraphView->resetLayout();
 }
+void Daily::ResetGraphOrder()
+{
+    GraphView->resetGraphOrder();
+    ResetGraphLayout();
+}
+
 void Daily::graphtogglebutton_toggled(bool b)
 {
     Q_UNUSED(b)

oscar/daily.h

@@ -60,12 +60,18 @@ public:
     /*! \fn ReloadGraphs()
         \brief Reload all graph information from disk and updates the view.
         */
+
     void ReloadGraphs();
     /*! \fn ResetGraphLayout()
         \brief Resets all graphs in the main gGraphView back to constant heights.
         */
     void ResetGraphLayout();
 
+    /*! \fn ResetGraphOrder()
+        \brief Resets all graphs in the main gGraphView back to their initial order.
+        */
+    void ResetGraphOrder();
+
     /*! \fn updateLeftSidebar()
         /brief Updtes left sidebar to reflect changes in pie chart visibility
         */
@@ -342,7 +348,7 @@ private:
 
     bool ZombieMeterMoved;
     bool BookmarksChanged;
+
 };
 
-
 #endif // DAILY_H

oscar/docs/release_notes.html

@@ -12,6 +12,7 @@ Which was written and copyright 2011-2018 © Mark Watkins
 <ul>
 <li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
 <li>[new] DreamStation BiPAP S/T and AVAPS ventilators (1030X and 1130X) are now supported. The settings aren't yet displayed correctly, but therapy events and graphs should now display properly.</li>
+<li>[new] View/Reset Graphs organizes graphs in their original order</li>
 <li>[fix] Improve progress bar for statistics cache update</li>
 </ul>
 </p>

oscar/mainwindow.cpp

@@ -1300,6 +1300,13 @@ void MainWindow::on_action_Reset_Graph_Layout_triggered()
     if (overview && (ui->tabWidget->currentWidget() == overview)) { overview->ResetGraphLayout(); }
 }
 
+void MainWindow::on_action_Reset_Graph_Order_triggered()
+{
+    if (daily && (ui->tabWidget->currentWidget() == daily)) { daily->ResetGraphOrder(); }
+
+    if (overview && (ui->tabWidget->currentWidget() == overview)) { overview->ResetGraphOrder(); }
+}
+
 void MainWindow::on_action_Preferences_triggered()
 {
     if (!p_profile) {

oscar/mainwindow.h

@@ -213,6 +213,9 @@ class MainWindow : public QMainWindow
     //! \brief passes the ResetGraphLayout menu click to the Daily & Overview views
     void on_action_Reset_Graph_Layout_triggered();
 
+    //! \brief passes the ResetGraphOrder menu click to the Daily & Overview views
+    void on_action_Reset_Graph_Order_triggered();
+
     //! \brief Opens the Preferences Dialog, and saving changes if OK is pressed
     void on_action_Preferences_triggered();
 

oscar/mainwindow.ui

@@ -2836,6 +2836,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="action_Reset_Graph_Layout"/>
     <addaction name="separator"/>
     <addaction name="actionLine_Cursor"/>
@@ -3007,7 +3008,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="action_Reset_Graph_Layout">
    <property name="text">
-    <string>&amp;Reset Graph Layout</string>
+    <string>Reset Graph &amp;Heights</string>
    </property>
    <property name="toolTip">
     <string>Reset sizes of graphs</string>
@@ -3230,6 +3231,14 @@ p, li { white-space: pre-wrap; }
     <string>Ctrl+P</string>
    </property>
   </action>
+  <action name="action_Reset_Graph_Order">
+   <property name="text">
+    <string>&amp;Reset Graphs</string>
+   </property>
+   <property name="toolTip">
+    <string>Reset order of graphs page to initial order</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

oscar/overview.cpp

@@ -121,6 +121,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
     icon_off = new QIcon(":/icons/session-off.png");
 
     GraphView->resetLayout();
+    GraphView->SaveDefaultSettings();
     GraphView->LoadSettings("Overview"); //no trans
 
     GraphView->setEmptyImage(QPixmap(":/icons/logo-md.png"));
@@ -415,6 +416,12 @@ void Overview::ResetGraphLayout()
     GraphView->resetLayout();
 }
 
+void Overview::ResetGraphOrder()
+{
+    GraphView->resetGraphOrder();
+    ResetGraphLayout();
+}
+
 void Overview::on_rangeCombo_activated(int index)
 {
     p_profile->general->setLastOverviewRange(index);

oscar/overview.h

@@ -55,6 +55,11 @@ class Overview : public QWidget
     //! \brief Reset graphs to uniform heights
     void ResetGraphLayout();
 
+    /*! \fn ResetGraphOrder()
+        \brief Resets all graphs in the main gGraphView back to their initial order.
+        */
+    void ResetGraphOrder();
+
     //! \brief Calls updateGL to redraw the overview charts
     void RedrawGraphs();