From 3b1414c37d7c349be5fa2e210732a99ad238b768 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Wed, 31 Jul 2019 08:40:20 -0700
Subject: [PATCH] When reverting to original graph order, reset any pins.

---
 oscar/Graphs/gGraphView.cpp | 13 ++++++++++---
 oscar/Graphs/gGraphView.h   |  2 +-
 oscar/daily.cpp             |  2 +-
 oscar/overview.cpp          |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp
index 335c567d..9ca8074e 100644
--- a/oscar/Graphs/gGraphView.cpp
+++ b/oscar/Graphs/gGraphView.cpp
@@ -3306,9 +3306,16 @@ void gGraphView::resetLayout()
     updateScale();
     timedRedraw(0);
 }
-// Reset order of current graphs to match defaults
-void gGraphView::resetGraphOrder() {
-   m_graphs = m_default_graphs;
+// 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() {
diff --git a/oscar/Graphs/gGraphView.h b/oscar/Graphs/gGraphView.h
index a1bc6f97..13e96c67 100644
--- a/oscar/Graphs/gGraphView.h
+++ b/oscar/Graphs/gGraphView.h
@@ -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);
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index 08b399cc..6be789db 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -851,7 +851,7 @@ void Daily::ResetGraphLayout()
 }
 void Daily::ResetGraphOrder()
 {
-    GraphView->resetGraphOrder();
+    GraphView->resetGraphOrder(true);
     ResetGraphLayout();
 }
 
diff --git a/oscar/overview.cpp b/oscar/overview.cpp
index ecc590ce..3d8e1bb6 100644
--- a/oscar/overview.cpp
+++ b/oscar/overview.cpp
@@ -418,7 +418,7 @@ void Overview::ResetGraphLayout()
 
 void Overview::ResetGraphOrder()
 {
-    GraphView->resetGraphOrder();
+    GraphView->resetGraphOrder(false);
     ResetGraphLayout();
 }