diff --git a/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp b/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp index af33bc7..0470375 100644 --- a/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp +++ b/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp @@ -399,6 +399,7 @@ nlohmann::json SpectrumAnalyzer::toJSON() freq["stop"] = settings.freqStop; sweep["frequency"] = freq; sweep["single"] = singleSweep; + sweep["averages"] = averages; nlohmann::json acq; acq["RBW"] = settings.RBW; acq["window"] = WindowToString((DeviceDriver::SASettings::Window) settings.window).toStdString(); @@ -505,6 +506,7 @@ void SpectrumAnalyzer::fromJSON(nlohmann::json j) EnableNormalization(correctSize); } SetSingleSweep(sweep.value("single", singleSweep)); + SetAveraging(sweep.value("averages", averages)); } } diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp index aba2d3d..92920fb 100644 --- a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp +++ b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp @@ -884,6 +884,7 @@ nlohmann::json VNA::toJSON() sweep["power"] = power; sweep["points"] = settings.npoints; sweep["IFBW"] = settings.bandwidth; + sweep["averages"] = averages; j["sweep"] = sweep; j["traces"] = traceModel.toJSON(); @@ -921,6 +922,7 @@ void VNA::fromJSON(nlohmann::json j) // restore sweep settings, keep current value as default in case of missing entry SetPoints(sweep.value("points", settings.npoints)); SetIFBandwidth(sweep.value("IFBW", settings.bandwidth)); + SetAveraging(sweep.value("averages", averages)); if(sweep.contains("frequency")) { auto freq = sweep["frequency"]; SetStartFreq(freq.value("start", settings.Freq.start));