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

When reverting to original graph order, reset any pins.

Browse Source
This commit is contained in:
Seeker4 2019-07-31 08:40:20 -07:00
parent 4532b22fc6
commit 3b1414c37d
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oscar/Graphs/gGraphView.cpp
View File

@ -3306,9 +3306,16 @@ void gGraphView::resetLayout()
updateScale();
timedRedraw(0);
}
// Reset order of current graphs to match defaults
void gGraphView::resetGraphOrder() {
// Reset order of current graphs to match defaults, remove pinning
void gGraphView::resetGraphOrder(bool pinFirst) {
m_graphs = m_default_graphs;
for (auto & graph : m_graphs) {
if (!graph) continue;
if (graph->isSnapshot()) continue;
graph->setPinned(false);
}
if (pinFirst)
m_graphs[0]->setPinned(true);
}
void gGraphView::SaveDefaultSettings() {

2
oscar/Graphs/gGraphView.h
View File

@ -377,7 +377,7 @@ class gGraphView
void SaveDefaultSettings();
//! \brief Reset the current graph order, heights, min & max Y values to match default values
void resetGraphOrder();
void resetGraphOrder(bool pinFirst);
//! \brief Returns the graph object matching the supplied name, nullptr if it does not exist.
gGraph *findGraph(QString name);

2
oscar/daily.cpp
View File

@ -851,7 +851,7 @@ void Daily::ResetGraphLayout()
}
void Daily::ResetGraphOrder()
{
GraphView->resetGraphOrder();
GraphView->resetGraphOrder(true);
ResetGraphLayout();
}

2
oscar/overview.cpp
View File

@ -418,7 +418,7 @@ void Overview::ResetGraphLayout()
void Overview::ResetGraphOrder()
{
GraphView->resetGraphOrder();
GraphView->resetGraphOrder(false);
ResetGraphLayout();
}