From 9d05b1bf3ef6cc480f58c9fc457e7d044c2dcdd4 Mon Sep 17 00:00:00 2001
From: LoudSnorer <just4me.1947@gmail.com>
Date: Thu, 2 Mar 2023 19:28:09 -0500
Subject: [PATCH] fix oscar crash on View > Reset Graphs issue

---
 oscar/Graphs/gGraphView.cpp |  4 ++--
 oscar/daily.cpp             | 40 ++++++++++++++++++-------------------
 oscar/daily.h               |  2 ++
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp
index 947858fe..f0ffe94d 100644
--- a/oscar/Graphs/gGraphView.cpp
+++ b/oscar/Graphs/gGraphView.cpp
@@ -3541,7 +3541,7 @@ void gGraphView::resetGraphOrder(bool pinFirst, const QList<QString> graphOrder)
         QString nextGraph = graphOrder.at(i);
         auto it = m_graphsbyname.find(nextGraph);
         if (it == m_graphsbyname.end()) {
-            qDebug() << "resetGraphOrder could not find" << nextGraph;
+            // qDebug() << "resetGraphOrder could not find" << nextGraph;
             continue;  // should not happen
         }
         gGraph * graph = it.value();
@@ -3552,7 +3552,7 @@ void gGraphView::resetGraphOrder(bool pinFirst, const QList<QString> graphOrder)
     }
     // If we didn't find everything, append anything extra we have
     for (int i = 0; i < old_graphs.size(); i++) {
-        qDebug() << "resetGraphOrder added leftover" << old_graphs.at(i)->name();
+        // qDebug() << "resetGraphOrder added leftover" << old_graphs.at(i)->name();
         new_graphs.append(old_graphs.at(i));
     }
 
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index 13209a99..b41b512f 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -7,7 +7,7 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
-#define TEST_MACROS_ENABLED
+#define TEST_MACROS_ENABLEDoff
 #include <test_macros.h>
 
 #include <QTextCharFormat>
@@ -1007,13 +1007,7 @@ void Daily::ResetGraphOrder(int type)
     }
 
     // Enable all graphs (make them not hidden)
-    for (int i=1;i<ui->graphCombo->count();i++) {
-        // If disabled, emulate a click to enable the graph
-        if (!ui->graphCombo->itemData(i,Qt::UserRole).toBool()) {
-//            qDebug() << "resetting graph" << i;
-            Daily::on_graphCombo_activated(i);
-        }
-    }
+    showAllGraphs(true);
 
     // Mark all events as active
     for (int i=1;i<ui->eventsCombo->count();i++) {
@@ -2691,25 +2685,31 @@ void Daily::setFlagText () {
     ui->eventsCombo->setItemText(0, flagsText);
 }
 
+void Daily::showAllGraphs(bool show) {
+    //Skip over first button - label for comboBox
+    for (int i=1;i<ui->graphCombo->count();i++) {
+        showGraph(i,show);
+    }
+    setGraphText();
+}
+
+void Daily::showGraph(int index,bool b) {
+    QString graphName = ui->graphCombo->itemText(index);
+    ui->graphCombo->setItemData(index,b,Qt::UserRole);
+    ui->graphCombo->setItemIcon(index, b ? *icon_on : *icon_off);
+    gGraph* graph=GraphView->findGraphTitle(graphName);
+    if (graph) graph->setVisible(b);
+}
+
 void Daily::on_graphCombo_activated(int index)
 {
-    if (index<0)
-        return;
-
-    gGraph *g;
-    QString s;
-    s=ui->graphCombo->currentText();
+    if (index<0) return;
     if (index > 0) {
         bool b=!ui->graphCombo->itemData(index,Qt::UserRole).toBool();
-        ui->graphCombo->setItemData(index,b,Qt::UserRole);
-        ui->graphCombo->setItemIcon(index, b ? *icon_on : *icon_off);
-
-        g=GraphView->findGraphTitle(s);
-        g->setVisible(b);
+        showGraph(index,b);
         ui->graphCombo->showPopup();
     }
     ui->graphCombo->setCurrentIndex(0);
-
     setGraphText();
     updateCube();
     GraphView->updateScale();
diff --git a/oscar/daily.h b/oscar/daily.h
index 5790c02a..62b6fba4 100644
--- a/oscar/daily.h
+++ b/oscar/daily.h
@@ -139,6 +139,8 @@ public:
 
     //void populateSessionWidget();
 
+    void showAllGraphs(bool show);
+    void showGraph(int index,bool b);
 
 public slots:
     void on_LineCursorUpdate(double time);