From 2e1069b8d0af0b829aa8d33f29201ade9a94a9f3 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Sat, 28 Sep 2019 20:15:16 -0700 Subject: [PATCH] Allow user to select graph order when resetting -- Standard or Advanced --- oscar/daily.cpp | 18 ++++++++++++------ oscar/daily.h | 2 +- oscar/mainwindow.cpp | 18 ++++++++++++++++-- oscar/mainwindow.h | 6 ++++++ oscar/mainwindow.ui | 33 ++++++++++++++++++++++++--------- oscar/overview.cpp | 3 ++- oscar/overview.h | 2 +- 7 files changed, 62 insertions(+), 20 deletions(-) diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 8fd8bc60..f0538202 100644 --- 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;igraphCombo->count();i++) { diff --git a/oscar/daily.h b/oscar/daily.h index 90fdd8a3..35e9d4cb 100644 --- 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 diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 9bdbda9e..f9bfd5b7 100644 --- 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() diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h index 8e18df43..bcf60e20 100644 --- 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(); diff --git a/oscar/mainwindow.ui b/oscar/mainwindow.ui index 65e595ec..ff346765 100644 --- a/oscar/mainwindow.ui +++ b/oscar/mainwindow.ui @@ -1211,7 +1211,7 @@ QToolBox::tab:selected { 0 0 - 175 + 174 687 @@ -1669,7 +1669,7 @@ border: 2px solid #56789a; border-radius: 30px; 0 0 - 175 + 174 687 @@ -2714,7 +2714,7 @@ border-radius: 10px; <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +<p style="-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';"><br /></p></body></html> false @@ -2728,7 +2728,7 @@ p, li { white-space: pre-wrap; } 0 0 - 175 + 174 687 @@ -2771,7 +2771,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +<p style="-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';"><br /></p></body></html> false @@ -2829,6 +2829,13 @@ p, li { white-space: pre-wrap; } &View + + + &Reset Graphs + + + + @@ -2836,7 +2843,7 @@ p, li { white-space: pre-wrap; } - + @@ -3231,12 +3238,20 @@ p, li { white-space: pre-wrap; } Ctrl+P - + - &Reset Graphs + Standard - Reset order of graphs page to initial order + Standard graph order, good for CPAP, APAP, Bi-Level + + + + + Advanced + + + Advanced graph order, good for ASV, AVAPS diff --git a/oscar/overview.cpp b/oscar/overview.cpp index 997e0e40..0b864566 100644 --- 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(); } diff --git a/oscar/overview.h b/oscar/overview.h index d1ea94bd..5a434b18 100644 --- 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();