From d2f1ca8f954e65f78c683e92cf268398287e529a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Sat, 1 Oct 2022 02:31:42 +0200
Subject: [PATCH] remove calEdited flag from VNA class

---
 Software/PC_Application/VNA/vna.cpp | 6 +-----
 Software/PC_Application/VNA/vna.h   | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp
index 6836e8d..63d4139 100644
--- a/Software/PC_Application/VNA/vna.cpp
+++ b/Software/PC_Application/VNA/vna.cpp
@@ -62,7 +62,6 @@ VNA::VNA(AppWindow *window, QString name)
     calMeasuring = false;
     calWaitFirst = false;
     calDialog.reset();
-    calEdited = false;
     changingSettings = false;
     settings.sweepType = SweepType::Frequency;
     settings.zerospan = false;
@@ -89,7 +88,6 @@ VNA::VNA(AppWindow *window, QString name)
 
     connect(saveCal, &QAction::triggered, [=](){
         if(cal.toFile()) {
-            calEdited = false;
             UpdateStatusbar();
         }
     });
@@ -672,7 +670,7 @@ void VNA::deviceDisconnected()
 
 void VNA::shutdown()
 {
-    if(calEdited && cal.getCaltype().type != Calibration::Type::None) {
+    if(cal.hasUnsavedChanges() && cal.getCaltype().type != Calibration::Type::None) {
         auto save = InformationBox::AskQuestion("Save calibration?", "The calibration contains data that has not been saved yet. Do you want to save it before exiting?", false);
         if(save) {
             cal.toFile();
@@ -1223,7 +1221,6 @@ void VNA::StartCalibrationMeasurements(std::set<CalibrationMeasurement::Base*> m
         // enable calibration measurement only in transmission callback (prevents accidental sampling of data which was still being processed)
         calMeasuring = true;
     });
-    calEdited = true;
 }
 
 void VNA::SetupSCPI()
@@ -1647,5 +1644,4 @@ void VNA::SetSingleSweep(bool single)
 bool VNA::LoadCalibration(QString filename)
 {
     cal.fromFile(filename);
-    calEdited = false;
 }
diff --git a/Software/PC_Application/VNA/vna.h b/Software/PC_Application/VNA/vna.h
index 44b2587..45f493f 100644
--- a/Software/PC_Application/VNA/vna.h
+++ b/Software/PC_Application/VNA/vna.h
@@ -140,8 +140,6 @@ private:
     // Calibration
     Calibration cal;
     bool changingSettings;
-//    bool calValid;
-    bool calEdited;
     std::set<CalibrationMeasurement::Base*> calMeasurements;
     bool calMeasuring;
     bool calWaitFirst;