From 853cf310c98f4077a4c3c178888b173161e85c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sat, 29 Jul 2023 18:11:57 +0200 Subject: [PATCH] Start GUI with ideal calibration standards --- .../LibreVNA-GUI/Calibration/calkit.cpp | 11 +++++++++++ .../PC_Application/LibreVNA-GUI/Calibration/calkit.h | 2 ++ Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp | 2 ++ 3 files changed, 15 insertions(+) diff --git a/Software/PC_Application/LibreVNA-GUI/Calibration/calkit.cpp b/Software/PC_Application/LibreVNA-GUI/Calibration/calkit.cpp index f10ab3d..ea1c118 100644 --- a/Software/PC_Application/LibreVNA-GUI/Calibration/calkit.cpp +++ b/Software/PC_Application/LibreVNA-GUI/Calibration/calkit.cpp @@ -414,3 +414,14 @@ void Calkit::fromJSON(nlohmann::json j) standards.push_back(s); } } + +void Calkit::setIdealDefault() +{ + manufacturer = "LibreVNA"; + description = "Default calibration kit with ideal standards"; + clearStandards(); + addStandard(new CalStandard::Open("Ideal Open Standard", 50.0, 0, 0, 0, 0, 0, 0)); + addStandard(new CalStandard::Short("Ideal Short Standard", 50.0, 0, 0, 0, 0, 0, 0)); + addStandard(new CalStandard::Load("Ideal Load Standard", 50.0, 0, 0, 50.0, 0, 0)); + addStandard(new CalStandard::Through("Ideal Through Standard", 50.0, 0, 0)); +} diff --git a/Software/PC_Application/LibreVNA-GUI/Calibration/calkit.h b/Software/PC_Application/LibreVNA-GUI/Calibration/calkit.h index 0bea69b..71ccdac 100644 --- a/Software/PC_Application/LibreVNA-GUI/Calibration/calkit.h +++ b/Software/PC_Application/LibreVNA-GUI/Calibration/calkit.h @@ -53,6 +53,8 @@ public: virtual nlohmann::json toJSON() override; virtual void fromJSON(nlohmann::json j) override; + void setIdealDefault(); + private: void clearStandards(); QString manufacturer, serialnumber, description; diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp index 560e9da..5755b9c 100644 --- a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp +++ b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp @@ -157,6 +157,8 @@ VNA::VNA(AppWindow *window, QString name) } }); + cal.getKit().setIdealDefault(); + // portExtension.setCalkit(&cal.getCalibrationKit()); // De-embedding menu