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

Linear magnitude option

Browse Source
This commit is contained in:
Jan Käberich 2022-03-13 23:00:06 +01:00
parent 602289d9cb
commit d526270fd2
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Software/PC_Application/LibreVNA-GUI.pro
View File

@ -305,5 +305,5 @@ RESOURCES += \
CONFIG += c++17 CONFIG += c++17
REVISION = $$system(git rev-parse HEAD) REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\" DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=1 FW_MINOR=2 FW_PATCH=1 FW_SUFFIX=""#\\"\"-alpha.2\\"\" DEFINES += FW_MAJOR=1 FW_MINOR=2 FW_PATCH=2 FW_SUFFIX=""#\\"\"-alpha.2\\"\"
DEFINES -= _UNICODE UNICODE DEFINES -= _UNICODE UNICODE

6
Software/PC_Application/Traces/tracexyplot.cpp
View File

@ -886,6 +886,7 @@ QString TraceXYPlot::AxisTypeToName(TraceXYPlot::YAxisType type)
switch(type) { switch(type) {
case YAxisType::Disabled: return "Disabled"; case YAxisType::Disabled: return "Disabled";
case YAxisType::Magnitude: return "Magnitude"; case YAxisType::Magnitude: return "Magnitude";
case YAxisType::MagnitudeLinear: return "Magnitude (linear)";
case YAxisType::Phase: return "Phase"; case YAxisType::Phase: return "Phase";
case YAxisType::UnwrappedPhase: return "Unwrapped Phase"; case YAxisType::UnwrappedPhase: return "Unwrapped Phase";
case YAxisType::VSWR: return "VSWR"; case YAxisType::VSWR: return "VSWR";
@ -998,6 +999,9 @@ QPointF TraceXYPlot::traceToCoordinate(Trace *t, unsigned int sample, TraceXYPlo
case YAxisType::Magnitude: case YAxisType::Magnitude:
ret.setY(Util::SparamTodB(data.y)); ret.setY(Util::SparamTodB(data.y));
break; break;
case YAxisType::MagnitudeLinear:
ret.setY(abs(data.y));
break;
case YAxisType::Phase: case YAxisType::Phase:
ret.setY(Util::SparamToDegree(data.y)); ret.setY(Util::SparamToDegree(data.y));
break; break;
@ -1236,6 +1240,7 @@ QString TraceXYPlot::AxisUnit(TraceXYPlot::YAxisType type)
if(source == TraceModel::DataSource::VNA) { if(source == TraceModel::DataSource::VNA) {
switch(type) { switch(type) {
case TraceXYPlot::YAxisType::Magnitude: return "dB"; case TraceXYPlot::YAxisType::Magnitude: return "dB";
case TraceXYPlot::YAxisType::MagnitudeLinear: return "";
case TraceXYPlot::YAxisType::Phase: return "°"; case TraceXYPlot::YAxisType::Phase: return "°";
case TraceXYPlot::YAxisType::UnwrappedPhase: return "°"; case TraceXYPlot::YAxisType::UnwrappedPhase: return "°";
case TraceXYPlot::YAxisType::VSWR: return ""; case TraceXYPlot::YAxisType::VSWR: return "";
@ -1270,6 +1275,7 @@ QString TraceXYPlot::AxisPrefixes(TraceXYPlot::YAxisType type)
if(source == TraceModel::DataSource::VNA) { if(source == TraceModel::DataSource::VNA) {
switch(type) { switch(type) {
case TraceXYPlot::YAxisType::Magnitude: return " "; case TraceXYPlot::YAxisType::Magnitude: return " ";
case TraceXYPlot::YAxisType::MagnitudeLinear: return "num ";
case TraceXYPlot::YAxisType::Phase: return " "; case TraceXYPlot::YAxisType::Phase: return " ";
case TraceXYPlot::YAxisType::UnwrappedPhase: return " "; case TraceXYPlot::YAxisType::UnwrappedPhase: return " ";
case TraceXYPlot::YAxisType::VSWR: return " "; case TraceXYPlot::YAxisType::VSWR: return " ";

1
Software/PC_Application/Traces/tracexyplot.h
View File

@ -16,6 +16,7 @@ public:
Disabled, Disabled,
// S parameter options // S parameter options
Magnitude, Magnitude,
MagnitudeLinear,
Phase, Phase,
UnwrappedPhase, UnwrappedPhase,
VSWR, VSWR,

1
Software/PC_Application/Traces/xyplotaxisdialog.cpp
View File

@ -230,6 +230,7 @@ std::set<TraceXYPlot::YAxisType> XYplotAxisDialog::supportedYAxis(TraceXYPlot::X
case TraceXYPlot::XAxisType::Frequency: case TraceXYPlot::XAxisType::Frequency:
case TraceXYPlot::XAxisType::Power: case TraceXYPlot::XAxisType::Power:
ret.insert(TraceXYPlot::YAxisType::Magnitude); ret.insert(TraceXYPlot::YAxisType::Magnitude);
ret.insert(TraceXYPlot::YAxisType::MagnitudeLinear);
ret.insert(TraceXYPlot::YAxisType::Phase); ret.insert(TraceXYPlot::YAxisType::Phase);
ret.insert(TraceXYPlot::YAxisType::UnwrappedPhase); ret.insert(TraceXYPlot::YAxisType::UnwrappedPhase);
ret.insert(TraceXYPlot::YAxisType::VSWR); ret.insert(TraceXYPlot::YAxisType::VSWR);