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

fix wrong format when saving 2xthru de-embedding

Browse Source
This commit is contained in:
Jan Käberich 2022-12-12 10:57:23 +01:00
parent 89c9f20d16
commit 917b33f17d
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/twothru.cpp
View File

@ -200,6 +200,7 @@ nlohmann::json TwoThru::toJSON()
nlohmann::json j; nlohmann::json j;
j["port1"] = port1; j["port1"] = port1;
j["port2"] = port2; j["port2"] = port2;
nlohmann::json jpoints;
for(auto p : points) { for(auto p : points) {
nlohmann::json jp; nlohmann::json jp;
jp["frequency"] = p.freq; jp["frequency"] = p.freq;
@ -219,17 +220,32 @@ nlohmann::json TwoThru::toJSON()
jp["p2_21_i"] = p.inverseP2.m21.imag(); jp["p2_21_i"] = p.inverseP2.m21.imag();
jp["p2_22_r"] = p.inverseP2.m22.real(); jp["p2_22_r"] = p.inverseP2.m22.real();
jp["p2_22_i"] = p.inverseP2.m22.imag(); jp["p2_22_i"] = p.inverseP2.m22.imag();
j.push_back(jp); jpoints.push_back(jp);
} }
j["points"] = jpoints;
return j; return j;
} }
void TwoThru::fromJSON(nlohmann::json j) void TwoThru::fromJSON(nlohmann::json j)
{ {
port1 = j.value("port1", 1); nlohmann::json jpoints;
port2 = j.value("port2", 2); if(j.is_array()) {
// old format, containing the points as an array in the root json
jpoints = j;
port1 = 1;
port2 = 2;
} else {
port1 = j.value("port1", 1);
port2 = j.value("port2", 2);
if(j.contains("points")) {
jpoints = j["points"];
} else {
// missing points
jpoints = nlohmann::json();
}
}
points.clear(); points.clear();
for(auto jp : j) { for(auto jp : jpoints) {
Point p; Point p;
p.freq = jp.value("frequency", 0.0); p.freq = jp.value("frequency", 0.0);
p.inverseP1.m11 = complex<double>(jp.value("p1_11_r", 0.0), jp.value("p1_11_i", 0.0)); p.inverseP1.m11 = complex<double>(jp.value("p1_11_r", 0.0), jp.value("p1_11_i", 0.0));