From 423585845e9491f5ffc8032bba8a8e21c2d3485c Mon Sep 17 00:00:00 2001
From: Kiara Navarro <sophiekovalevsky@fedoraproject.org>
Date: Thu, 23 Jun 2022 21:46:12 -0500
Subject: [PATCH] vna/mode/app/sa: refactor plot update colors

---
 .../SpectrumAnalyzer/spectrumanalyzer.cpp             | 11 -----------
 .../SpectrumAnalyzer/spectrumanalyzer.h               |  1 -
 Software/PC_Application/VNA/vna.cpp                   | 11 -----------
 Software/PC_Application/VNA/vna.h                     |  1 -
 Software/PC_Application/appwindow.cpp                 |  9 ++-------
 Software/PC_Application/mode.cpp                      |  8 ++++++++
 Software/PC_Application/mode.h                        |  1 +
 7 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
index a52a85a..701b396 100644
--- a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
+++ b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
@@ -73,12 +73,6 @@ SpectrumAnalyzer::SpectrumAnalyzer(AppWindow *window, QString name)
     traceXY->setYAxis(0, YAxis::Type::Magnitude, false, false, -120,0,10);
     traceXY->setYAxis(1, YAxis::Type::Disabled, false, true, 0,0,1);
 
-    connect(this, &SpectrumAnalyzer::graphColorsChanged, [=](){
-        for (auto p : TracePlot::getPlots()) {
-            p->updateGraphColors();
-        }
-    });
-
     central->setPlot(traceXY);
 
     // Create menu entries and connections
@@ -1127,11 +1121,6 @@ void SpectrumAnalyzer::StoreSweepSettings()
     s.setValue("SASignalID", static_cast<bool>(settings.SignalID));
 }
 
-void SpectrumAnalyzer::updateGraphColors()
-{
-    emit graphColorsChanged();
-}
-
 void SpectrumAnalyzer::setAveragingMode(Averaging::Mode mode)
 {
     average.setMode(mode);
diff --git a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
index f9c387c..6a39a12 100644
--- a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
+++ b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
@@ -134,7 +134,6 @@ signals:
     void NormalizationLevelChanged(double level);
 
     void averagingChanged(unsigned int averages);
-    void graphColorsChanged();
 };
 
 #endif // VNA_H
diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp
index 0c030e9..516bae3 100644
--- a/Software/PC_Application/VNA/vna.cpp
+++ b/Software/PC_Application/VNA/vna.cpp
@@ -95,12 +95,6 @@ VNA::VNA(AppWindow *window, QString name)
     auto traceXY2 = new TraceXYPlot(traceModel);
     traceXY2->enableTrace(tS21, true);
 
-    connect(this, &VNA::graphColorsChanged, [=](){
-        for (auto p : TracePlot::getPlots()) {
-            p->updateGraphColors();
-        }
-    });
-
     connect(&traceModel, &TraceModel::requiredExcitation, this, &VNA::ExcitationRequired);
 
     central->splitVertically();
@@ -1644,11 +1638,6 @@ void VNA::EnableDeembedding(bool enable)
     enableDeembeddingAction->blockSignals(false);
 }
 
-void VNA::updateGraphColors()
-{
-    emit graphColorsChanged();
-}
-
 void VNA::setAveragingMode(Averaging::Mode mode)
 {
     average.setMode(mode);
diff --git a/Software/PC_Application/VNA/vna.h b/Software/PC_Application/VNA/vna.h
index a07f8b5..77068b2 100644
--- a/Software/PC_Application/VNA/vna.h
+++ b/Software/PC_Application/VNA/vna.h
@@ -110,7 +110,6 @@ private slots:
 
 signals:
     void CalibrationMeasurementsComplete(std::set<Calibration::Measurement> m);
-    void graphColorsChanged();
 
 private:
     bool CalibrationMeasurementActive() { return calWaitFirst || calMeasuring; }
diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp
index d5513bb..c7fa207 100644
--- a/Software/PC_Application/appwindow.cpp
+++ b/Software/PC_Application/appwindow.cpp
@@ -184,14 +184,9 @@ AppWindow::AppWindow(QWidget *parent)
                 StartTCPServer(p.SCPIServer.port);
             }
         }
-        auto active = Mode::getActiveMode();
 
-        if(active == spectrumAnalyzer) {
-            spectrumAnalyzer->updateGraphColors();
-        }
-        else if (active == vna) {
-             vna->updateGraphColors();
-        }
+        auto active = Mode::getActiveMode();
+        active->updateGraphColors();
 
         // averaging mode may have changed, update for all relevant modes
         if(p.Acquisition.useMedianAveraging) {
diff --git a/Software/PC_Application/mode.cpp b/Software/PC_Application/mode.cpp
index b8f6d7d..3140e9e 100644
--- a/Software/PC_Application/mode.cpp
+++ b/Software/PC_Application/mode.cpp
@@ -338,3 +338,11 @@ void Mode::setName(const QString &value)
     tabbar->setTabText(findTabIndex(), name);
 }
 
+void Mode::updateGraphColors()
+{
+    if ((getType() ==  Type::SA) || getType() ==  Type::VNA) {
+        for (auto p : TracePlot::getPlots()) {
+            p->updateGraphColors();
+        }
+    }
+}
diff --git a/Software/PC_Application/mode.h b/Software/PC_Application/mode.h
index 9d2f065..038cc53 100644
--- a/Software/PC_Application/mode.h
+++ b/Software/PC_Application/mode.h
@@ -32,6 +32,7 @@ public:
     virtual void shutdown(){}; // called when the application is about to exit
     QString getName() const;
     void setName(const QString &value);
+    void updateGraphColors();
     static Mode *getActiveMode();
     static QString TypeToName(Type t);
     static Type TypeFromName(QString s);