From 2265b8f6c08a303873b903e8377e93b47441397c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Fri, 4 Feb 2022 12:32:19 +0100 Subject: [PATCH] Add reference settings to setup file --- Software/PC_Application/appwindow.cpp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp index d0807cc..d9e7da3 100644 --- a/Software/PC_Application/appwindow.cpp +++ b/Software/PC_Application/appwindow.cpp @@ -942,6 +942,10 @@ nlohmann::json AppWindow::SaveSetup() j["VNA"] = vna->toJSON(); j["Generator"] = generator->toJSON(); j["SpectrumAnalyzer"] = spectrumAnalyzer->toJSON(); + nlohmann::json ref; + ref["Mode"] = toolbars.reference.type->currentText().toStdString(); + ref["Output"] = toolbars.reference.outFreq->currentText().toStdString(); + j["Reference"] = ref; return j; } @@ -970,9 +974,19 @@ void AppWindow::LoadSetup(nlohmann::json j) { // auto d = new JSONPickerDialog(j); // d->exec(); - vna->fromJSON(j["VNA"]); - generator->fromJSON(j["Generator"]); - spectrumAnalyzer->fromJSON(j["SpectrumAnalyzer"]); + if(j.contains("Reference")) { + toolbars.reference.type->setCurrentText(QString::fromStdString(j["Reference"].value("Mode", "Int"))); + toolbars.reference.outFreq->setCurrentText(QString::fromStdString(j["Reference"].value("Output", "Off"))); + } + if(j.contains("VNA")) { + vna->fromJSON(j["VNA"]); + } + if(j.contains("Generator")) { + generator->fromJSON(j["Generator"]); + } + if(j.contains("SpectrumAnalyzer")) { + spectrumAnalyzer->fromJSON(j["SpectrumAnalyzer"]); + } // activate the correct mode QString modeName = QString::fromStdString(j.value("activeMode", ""));