From fd5d21db0f4f6a04157de23cdae069976aca1560 Mon Sep 17 00:00:00 2001
From: Kiara Navarro <sophiekovalevsky@fedoraproject.org>
Date: Thu, 14 Jul 2022 08:51:45 -0500
Subject: [PATCH] mode: convert averaging mode as a method used in all modes

---
 Software/PC_Application/Generator/generator.h         |  2 ++
 .../SpectrumAnalyzer/spectrumanalyzer.h               |  2 +-
 Software/PC_Application/VNA/vna.h                     |  2 +-
 Software/PC_Application/appwindow.cpp                 | 11 ++---------
 Software/PC_Application/mode.h                        |  2 ++
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Software/PC_Application/Generator/generator.h b/Software/PC_Application/Generator/generator.h
index 41f4bb5..5d97585 100644
--- a/Software/PC_Application/Generator/generator.h
+++ b/Software/PC_Application/Generator/generator.h
@@ -18,6 +18,8 @@ public:
     virtual nlohmann::json toJSON() override;
     virtual void fromJSON(nlohmann::json j) override;
 
+    void setAveragingMode(Averaging::Mode mode) override {Q_UNUSED(mode)};
+
 private slots:
     void updateDevice();
 
diff --git a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
index d247d25..fcec0da 100644
--- a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
+++ b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
@@ -28,7 +28,7 @@ public:
     virtual void fromJSON(nlohmann::json j) override;
 
     void updateGraphColors();
-    void setAveragingMode(Averaging::Mode mode);
+    void setAveragingMode(Averaging::Mode mode) override;
 
 
 private:
diff --git a/Software/PC_Application/VNA/vna.h b/Software/PC_Application/VNA/vna.h
index 77068b2..2702af1 100644
--- a/Software/PC_Application/VNA/vna.h
+++ b/Software/PC_Application/VNA/vna.h
@@ -31,7 +31,7 @@ public:
     virtual void fromJSON(nlohmann::json j) override;
 
     void updateGraphColors();
-    void setAveragingMode(Averaging::Mode mode);
+    void setAveragingMode(Averaging::Mode mode) override;
 
     enum class SweepType {
         Frequency = 0,
diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp
index 11c87b1..a16dd5e 100644
--- a/Software/PC_Application/appwindow.cpp
+++ b/Software/PC_Application/appwindow.cpp
@@ -290,19 +290,12 @@ AppWindow::AppWindow(QWidget *parent)
             switch (m->getType())
             {
                 case Mode::Type::VNA:
-                    if(p.Acquisition.useMedianAveraging) {
-                        static_cast<VNA*>(m)->setAveragingMode(Averaging::Mode::Median);
-                    }
-                    else {
-                        static_cast<VNA*>(m)->setAveragingMode(Averaging::Mode::Mean);
-                    }
-                    break;
                 case Mode::Type::SA:
                     if(p.Acquisition.useMedianAveraging) {
-                        static_cast<SpectrumAnalyzer*>(m)->setAveragingMode(Averaging::Mode::Median);
+                        m->setAveragingMode(Averaging::Mode::Median);
                     }
                     else {
-                        static_cast<SpectrumAnalyzer*>(m)->setAveragingMode(Averaging::Mode::Mean);
+                        m->setAveragingMode(Averaging::Mode::Mean);
                     }
                     break;
                 case Mode::Type::SG:
diff --git a/Software/PC_Application/mode.h b/Software/PC_Application/mode.h
index 9742e87..1784a5e 100644
--- a/Software/PC_Application/mode.h
+++ b/Software/PC_Application/mode.h
@@ -41,6 +41,8 @@ public:
 
     virtual void saveSreenshot();
 
+    virtual void setAveragingMode(Averaging::Mode mode) = 0;
+
 signals:
     void statusbarMessage(QString msg);
 protected: