jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-06 15:04:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Output format of trace data in SA mode changed

Browse source
This commit is contained in:
Jan Käberich 2021-04-22 18:06:38 +02:00
parent 69f13cface
commit 5855149d04
3 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Software/PC_Application/Traces/tracewidget.cpp
View file

@ -164,6 +164,21 @@ void TraceWidget::SetupSCPI()
return nullptr;
}
};
auto createStringFromData = [](Trace *t, const Trace::Data &d) -> QString {
if(Trace::isSAParamater(t->liveParameter())) {
if(std::isnan(d.x)) {
return "NaN";
}
return QString::number(20*log10(d.y.real()));
} else {
if(std::isnan(d.x)) {
return "NaN,NaN";
}
return QString::number(d.y.real())+","+QString::number(d.y.imag());
}
};
add(new SCPICommand("LIST", nullptr, [=](QStringList){
QString ret;
for(auto t : model.getTraces()) {
@ -180,7 +195,7 @@ void TraceWidget::SetupSCPI()
QString ret;
for(unsigned int i=0;i<t->size();i++) {
auto d = t->sample(i);
ret += "["+QString::number(d.x)+","+QString::number(d.y.real())+","+QString::number(d.y.imag())+"],";
ret += "["+QString::number(d.x)+","+createStringFromData(t, d)+"],";
}
ret.chop(1);
return ret;
@ -198,7 +213,7 @@ void TraceWidget::SetupSCPI()
if(std::isnan(d.x)) {
return "NaN,NaN";
} else {
return QString::number(d.y.real())+","+QString::number(d.y.imag());
return createStringFromData(t, d);
}
}
}));
@ -222,7 +237,7 @@ void TraceWidget::SetupSCPI()
return "ERROR";
}
auto d = t->interpolatedSample(t->findExtremumFreq(true));
return QString::number(d.x)+","+QString::number(d.y.real())+","+QString::number(d.y.imag());
return QString::number(d.x)+","+createStringFromData(t, d);
}));
add(new SCPICommand("MINAmplitude", nullptr, [=](QStringList params) -> QString {
auto t = findTrace(params);
@ -230,7 +245,7 @@ void TraceWidget::SetupSCPI()
return "ERROR";
}
auto d = t->interpolatedSample(t->findExtremumFreq(false));
return QString::number(d.x)+","+QString::number(d.y.real())+","+QString::number(d.y.imag());
return QString::number(d.x)+","+createStringFromData(t, d);
}));
add(new SCPICommand("NEW", [=](QStringList params) -> QString {
if(params.size() != 1) {