caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix trace parsing of old setup files

Browse Source
This commit is contained in:
Jan Käberich 2022-08-23 12:20:07 +02:00
parent 2b591aa362
commit 0ca87ec867
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Software/PC_Application/Traces/trace.cpp
View File

@ -753,7 +753,21 @@ void Trace::fromJSON(nlohmann::json j)
visible = j.value("visible", true); visible = j.value("visible", true);
auto type = QString::fromStdString(j.value("type", "Live")); auto type = QString::fromStdString(j.value("type", "Live"));
if(type == "Live") { if(type == "Live") {
liveParam = QString::fromStdString(j.value("parameter", "S11")); if(j.contains("parameter")) {
if(j["parameter"].type() == nlohmann::json::value_t::string) {
liveParam = QString::fromStdString(j.value("parameter", "S11"));
} else {
// old parameter setting is stored as a number
auto index = j.value("parameter", 0);
const QString parameterList[] = {"S11", "S12", "S21", "S22", "PORT1", "PORT2"};
if(index < 6) {
liveParam = parameterList[index];
} else {
liveParam = "S11";
}
}
}
_liveType = j.value("livetype", LivedataType::Overwrite); _liveType = j.value("livetype", LivedataType::Overwrite);
paused = j.value("paused", false); paused = j.value("paused", false);
} else if(type == "Touchstone" || type == "File") { } else if(type == "Touchstone" || type == "File") {