chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow user to select graph order when resetting -- Standard or Advanced

Browse Source
This commit is contained in:
Seeker4 2019-09-28 20:15:16 -07:00
parent f1e4face7f
commit 2e1069b8d0
7 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oscar/daily.cpp
View File

@ -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++) {

2
oscar/daily.h
View File

@ -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

18
oscar/mainwindow.cpp
View File

@ -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()

6
oscar/mainwindow.h
View File

@ -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();

33
oscar/mainwindow.ui
View File

@ -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>

3
oscar/overview.cpp
View File

@ -451,8 +451,9 @@ void Overview::ResetGraphLayout()
GraphView->resetLayout();
}
void Overview::ResetGraphOrder()
void Overview::ResetGraphOrder(int type)
{
Q_UNUSED(type)
GraphView->resetGraphOrder(false);
ResetGraphLayout();
}

2
oscar/overview.h
View File

@ -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();