From 5855149d043d6b979f2ce93103fa75c4be821025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Thu, 22 Apr 2021 18:06:38 +0200 Subject: [PATCH] Output format of trace data in SA mode changed --- Documentation/UserManual/ProgrammingGuide.pdf | Bin 200722 -> 200428 bytes Documentation/UserManual/ProgrammingGuide.tex | 37 ++++++++---------- .../PC_Application/Traces/tracewidget.cpp | 23 +++++++++-- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/Documentation/UserManual/ProgrammingGuide.pdf b/Documentation/UserManual/ProgrammingGuide.pdf index 6123e799e257e26b2ea17e2b76cfaab4ccaa207a..e13bdedc22480d3fc4063292cbd02089dace890a 100644 GIT binary patch delta 11412 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 delta 11785 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 diff --git a/Documentation/UserManual/ProgrammingGuide.tex b/Documentation/UserManual/ProgrammingGuide.tex index bd44ead..d0faf8d 100644 --- a/Documentation/UserManual/ProgrammingGuide.tex +++ b/Documentation/UserManual/ProgrammingGuide.tex @@ -552,33 +552,31 @@ Port1,Port2 \end{example} \subsubsection{SA:TRACe:DATA} -\query{Returns the data of a trace}{SA:TRACe:DATA?}{, either by name or by index}{comma-separated list of tuples [x, real(y), imag(y]} +\query{Returns the data of a trace}{SA:TRACe:DATA?}{, either by name or by index}{comma-separated list of tuples [x, dBm]} \begin{example} :SA:TRACE:DATA? PORT1 -[9.5e+8,1.56378e-5,0], -[9.501e+8,1.66861e-5,0], -[9.502e+8,1.89638e-5,0], -[9.503e+8,1.87195e-5,0], -[9.504e+8,1.47292e-5,0], -[9.505e+8,1.40006e-5,0], -[9.506e+8,1.65665e-5,0], -[9.507e+8,1.48342e-5,0], -[9.508e+8,1.83062e-5,0], -[9.509e+8,1.66752e-5,0] +[9.75e+8,-100.351], +[9.7505e+8,-95.7394], +[9.751e+8,-97.5749], +[9.7515e+8,-96.9667], +[9.752e+8,-96.2391], +[9.7525e+8,-94.8761], +[9.753e+8,-96.0805], +[9.7535e+8,-95.7997], +[9.754e+8,-95.2021], +[9.7545e+8,-96.3472] \end{example} \vspace{-0.6cm} \begin{center} -\footnotesize{Note 1: actual response will not include newlines between data points, only at the end}\\ -\footnotesize{Note 2: although the imaginary part is zero for all values, it is still included in the response}\\ +\footnotesize{Note: actual response will not include newlines between data points, only at the end}\\ \end{center} \subsubsection{SA:TRACe:AT} -\query{Returns the data at a specific frequency (possibly interpolated)}{SA:TRACe:AT?}{, either by name or by index\\, in Hz}{real,imag (or ``NaN,NaN'' if specified frequeny is invalid)} +\query{Returns the data at a specific frequency (possibly interpolated)}{SA:TRACe:AT?}{, either by name or by index\\, in Hz}{ or ``NaN'' if specified frequeny is invalid)} \begin{example} :SA:TRAC:AT? Port1 1000000000 --0.0458452,-0.028729 +-96.424 \end{example} -\footnotesize{Note: although the imaginary part is always zero, it is still included in the response}\\ \subsubsection{SA:TRACe:MAXFrequency} \query{Returns the highest frequency contained in the trace}{SA:TRACe:MAXFrequency?}{, either by name or by index}{maximum frequency in Hz} @@ -587,15 +585,14 @@ Port1,Port2 \query{Returns the lowest frequency contained in the trace}{SA:TRACe:MINFrequency?}{, either by name or by index}{maximum frequency in Hz} \subsubsection{SA:TRACe:MAXAmplitude} -\query{Returns the datapoint with the highest amplitude in the trace}{SA:TRACe:MAXAmplitude?}{, either by name or by index}{,, of the highest amplitude point} +\query{Returns the datapoint with the highest amplitude in the trace}{SA:TRACe:MAXAmplitude?}{, either by name or by index}{, of the highest amplitude point} \begin{example} :SA:TRAC:MAXA? Port1 -9.63e+8,4.05022e-5,0 +9.63e+8,-12.534 \end{example} -\footnotesize{Note: although the imaginary part is always zero, it is still included in the response}\\ \subsubsection{SA:TRACe:MINAmplitude} -\query{Returns the datapoint with the lowest amplitude in the trace}{SA:TRACe:MINAmplitude?}{, either by name or by index}{,, of the lowest amplitude point} +\query{Returns the datapoint with the lowest amplitude in the trace}{SA:TRACe:MINAmplitude?}{, either by name or by index}{, of the lowest amplitude point} \subsubsection{SA:TRACe:NEW} \event{Creates a new trace}{SA:TRACe:NEW}{} diff --git a/Software/PC_Application/Traces/tracewidget.cpp b/Software/PC_Application/Traces/tracewidget.cpp index b7ee867..d0b9acf 100644 --- a/Software/PC_Application/Traces/tracewidget.cpp +++ b/Software/PC_Application/Traces/tracewidget.cpp @@ -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;isize();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) {