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

Fix SCPI output of frequency values

Browse Source
This commit is contained in:
Jan Käberich 2022-06-12 21:15:37 +02:00
parent 51396491f8
commit d701ed64d7
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
View File

@ -819,7 +819,7 @@ void SpectrumAnalyzer::SetupSCPI()
return ""; return "";
} }
}, [=](QStringList) -> QString { }, [=](QStringList) -> QString {
return QString::number(settings.f_stop - settings.f_start); return QString::number(settings.f_stop - settings.f_start, 'f', 0);
})); }));
scpi_freq->add(new SCPICommand("START", [=](QStringList params) -> QString { scpi_freq->add(new SCPICommand("START", [=](QStringList params) -> QString {
unsigned long long newval; unsigned long long newval;
@ -830,7 +830,7 @@ void SpectrumAnalyzer::SetupSCPI()
return ""; return "";
} }
}, [=](QStringList) -> QString { }, [=](QStringList) -> QString {
return QString::number(settings.f_start); return QString::number(settings.f_start, 'f', 0);
})); }));
scpi_freq->add(new SCPICommand("CENTer", [=](QStringList params) -> QString { scpi_freq->add(new SCPICommand("CENTer", [=](QStringList params) -> QString {
unsigned long long newval; unsigned long long newval;
@ -841,7 +841,7 @@ void SpectrumAnalyzer::SetupSCPI()
return ""; return "";
} }
}, [=](QStringList) -> QString { }, [=](QStringList) -> QString {
return QString::number((settings.f_start + settings.f_stop)/2); return QString::number((settings.f_start + settings.f_stop)/2, 'f', 0);
})); }));
scpi_freq->add(new SCPICommand("STOP", [=](QStringList params) -> QString { scpi_freq->add(new SCPICommand("STOP", [=](QStringList params) -> QString {
unsigned long long newval; unsigned long long newval;
@ -852,7 +852,7 @@ void SpectrumAnalyzer::SetupSCPI()
return ""; return "";
} }
}, [=](QStringList) -> QString { }, [=](QStringList) -> QString {
return QString::number(settings.f_stop); return QString::number(settings.f_stop, 'f', 0);
})); }));
scpi_freq->add(new SCPICommand("FULL", [=](QStringList params) -> QString { scpi_freq->add(new SCPICommand("FULL", [=](QStringList params) -> QString {
Q_UNUSED(params) Q_UNUSED(params)

10
Software/PC_Application/Traces/tracewidget.cpp
View File

@ -209,7 +209,7 @@ void TraceWidget::SetupSCPI()
QString ret; QString ret;
for(unsigned int i=0;i<t->size();i++) { for(unsigned int i=0;i<t->size();i++) {
auto d = t->sample(i); auto d = t->sample(i);
ret += "["+QString::number(d.x)+","+createStringFromData(t, d)+"],"; ret += "["+QString::number(d.x, 'f', 0)+","+createStringFromData(t, d)+"],";
} }
ret.chop(1); ret.chop(1);
return ret; return ret;
@ -293,14 +293,14 @@ void TraceWidget::SetupSCPI()
if(!t) { if(!t) {
return "ERROR"; return "ERROR";
} }
return QString::number(t->maxX()); return QString::number(t->maxX(), 'f', 0);
})); }));
add(new SCPICommand("MINFrequency", nullptr, [=](QStringList params) -> QString { add(new SCPICommand("MINFrequency", nullptr, [=](QStringList params) -> QString {
auto t = findTrace(params); auto t = findTrace(params);
if(!t) { if(!t) {
return "ERROR"; return "ERROR";
} }
return QString::number(t->minX()); return QString::number(t->minX(), 'f', 0);
})); }));
add(new SCPICommand("MAXAmplitude", nullptr, [=](QStringList params) -> QString { add(new SCPICommand("MAXAmplitude", nullptr, [=](QStringList params) -> QString {
auto t = findTrace(params); auto t = findTrace(params);
@ -308,7 +308,7 @@ void TraceWidget::SetupSCPI()
return "ERROR"; return "ERROR";
} }
auto d = t->interpolatedSample(t->findExtremum(true)); auto d = t->interpolatedSample(t->findExtremum(true));
return QString::number(d.x)+","+createStringFromData(t, d); return QString::number(d.x, 'f', 0)+","+createStringFromData(t, d);
})); }));
add(new SCPICommand("MINAmplitude", nullptr, [=](QStringList params) -> QString { add(new SCPICommand("MINAmplitude", nullptr, [=](QStringList params) -> QString {
auto t = findTrace(params); auto t = findTrace(params);
@ -316,7 +316,7 @@ void TraceWidget::SetupSCPI()
return "ERROR"; return "ERROR";
} }
auto d = t->interpolatedSample(t->findExtremum(false)); auto d = t->interpolatedSample(t->findExtremum(false));
return QString::number(d.x)+","+createStringFromData(t, d); return QString::number(d.x, 'f', 0)+","+createStringFromData(t, d);
})); }));
add(new SCPICommand("NEW", [=](QStringList params) -> QString { add(new SCPICommand("NEW", [=](QStringList params) -> QString {
if(params.size() != 1) { if(params.size() != 1) {

10
Software/PC_Application/VNA/vna.cpp
View File

@ -1287,7 +1287,7 @@ void VNA::SetupSCPI()
return ""; return "";
} }
}, [=](QStringList) -> QString { }, [=](QStringList) -> QString {
return QString::number(settings.Freq.stop - settings.Freq.start); return QString::number(settings.Freq.stop - settings.Freq.start, 'f', 0);
})); }));
scpi_freq->add(new SCPICommand("START", [=](QStringList params) -> QString { scpi_freq->add(new SCPICommand("START", [=](QStringList params) -> QString {
unsigned long long newval; unsigned long long newval;
@ -1298,7 +1298,7 @@ void VNA::SetupSCPI()
return ""; return "";
} }
}, [=](QStringList) -> QString { }, [=](QStringList) -> QString {
return QString::number(settings.Freq.start); return QString::number(settings.Freq.start, 'f', 0);
})); }));
scpi_freq->add(new SCPICommand("CENTer", [=](QStringList params) -> QString { scpi_freq->add(new SCPICommand("CENTer", [=](QStringList params) -> QString {
unsigned long long newval; unsigned long long newval;
@ -1309,7 +1309,7 @@ void VNA::SetupSCPI()
return ""; return "";
} }
}, [=](QStringList) -> QString { }, [=](QStringList) -> QString {
return QString::number((settings.Freq.start + settings.Freq.stop)/2); return QString::number((settings.Freq.start + settings.Freq.stop)/2, 'f', 0);
})); }));
scpi_freq->add(new SCPICommand("STOP", [=](QStringList params) -> QString { scpi_freq->add(new SCPICommand("STOP", [=](QStringList params) -> QString {
unsigned long long newval; unsigned long long newval;
@ -1320,7 +1320,7 @@ void VNA::SetupSCPI()
return ""; return "";
} }
}, [=](QStringList) -> QString { }, [=](QStringList) -> QString {
return QString::number(settings.Freq.stop); return QString::number(settings.Freq.stop, 'f', 0);
})); }));
scpi_freq->add(new SCPICommand("FULL", [=](QStringList params) -> QString { scpi_freq->add(new SCPICommand("FULL", [=](QStringList params) -> QString {
Q_UNUSED(params) Q_UNUSED(params)
@ -1428,7 +1428,7 @@ void VNA::SetupSCPI()
return ""; return "";
} }
}, [=](QStringList) -> QString { }, [=](QStringList) -> QString {
return QString::number(settings.Power.frequency); return QString::number(settings.Power.frequency, 'f', 0);
})); }));
SCPINode::add(traceWidget); SCPINode::add(traceWidget);
auto scpi_cal = new SCPINode("CALibration"); auto scpi_cal = new SCPINode("CALibration");