jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2025-12-06 07:12:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

save number of averages in setup files

Browse source
This commit is contained in:
Jan Käberich 2025-12-02 11:30:16 +01:00
parent 65bc247a65
commit 0f9510e7a0
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp
View file

@ -399,6 +399,7 @@ nlohmann::json SpectrumAnalyzer::toJSON()
freq["stop"] = settings.freqStop; freq["stop"] = settings.freqStop;
sweep["frequency"] = freq; sweep["frequency"] = freq;
sweep["single"] = singleSweep; sweep["single"] = singleSweep;
sweep["averages"] = averages;
nlohmann::json acq; nlohmann::json acq;
acq["RBW"] = settings.RBW; acq["RBW"] = settings.RBW;
acq["window"] = WindowToString((DeviceDriver::SASettings::Window) settings.window).toStdString(); acq["window"] = WindowToString((DeviceDriver::SASettings::Window) settings.window).toStdString();
@ -505,6 +506,7 @@ void SpectrumAnalyzer::fromJSON(nlohmann::json j)
EnableNormalization(correctSize); EnableNormalization(correctSize);
} }
SetSingleSweep(sweep.value("single", singleSweep)); SetSingleSweep(sweep.value("single", singleSweep));
SetAveraging(sweep.value("averages", averages));
} }
} }

2
Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
View file

@ -884,6 +884,7 @@ nlohmann::json VNA::toJSON()
sweep["power"] = power; sweep["power"] = power;
sweep["points"] = settings.npoints; sweep["points"] = settings.npoints;
sweep["IFBW"] = settings.bandwidth; sweep["IFBW"] = settings.bandwidth;
sweep["averages"] = averages;
j["sweep"] = sweep; j["sweep"] = sweep;
j["traces"] = traceModel.toJSON(); 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 // restore sweep settings, keep current value as default in case of missing entry
SetPoints(sweep.value("points", settings.npoints)); SetPoints(sweep.value("points", settings.npoints));
SetIFBandwidth(sweep.value("IFBW", settings.bandwidth)); SetIFBandwidth(sweep.value("IFBW", settings.bandwidth));
SetAveraging(sweep.value("averages", averages));
if(sweep.contains("frequency")) { if(sweep.contains("frequency")) {
auto freq = sweep["frequency"]; auto freq = sweep["frequency"];
SetStartFreq(freq.value("start", settings.Freq.start)); SetStartFreq(freq.value("start", settings.Freq.start));