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

Add Reactance Y-axis option (imaginary impedance in ohms)

Browse Source
This commit is contained in:
Andrew Rodland 2021-10-11 21:28:10 -04:00
parent d9000903dc
commit 604a51560c
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Software/PC_Application/LibreVNA-GUI
View File

Binary file not shown.

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

@ -22,6 +22,7 @@ const set<TraceXYPlot::YAxisType> TraceXYPlot::YAxisTypes = {TraceXYPlot::YAxisT
TraceXYPlot::YAxisType::Real, TraceXYPlot::YAxisType::Real,
TraceXYPlot::YAxisType::Imaginary, TraceXYPlot::YAxisType::Imaginary,
TraceXYPlot::YAxisType::SeriesR, TraceXYPlot::YAxisType::SeriesR,
TraceXYPlot::YAxisType::Reactance,
TraceXYPlot::YAxisType::Capacitance, TraceXYPlot::YAxisType::Capacitance,
TraceXYPlot::YAxisType::Inductance, TraceXYPlot::YAxisType::Inductance,
TraceXYPlot::YAxisType::QualityFactor, TraceXYPlot::YAxisType::QualityFactor,
@ -791,6 +792,7 @@ QString TraceXYPlot::AxisTypeToName(TraceXYPlot::YAxisType type)
case YAxisType::Real: return "Real (R)"; case YAxisType::Real: return "Real (R)";
case YAxisType::Imaginary: return "Imaginary (X)"; case YAxisType::Imaginary: return "Imaginary (X)";
case YAxisType::SeriesR: return "Resistance"; case YAxisType::SeriesR: return "Resistance";
case YAxisType::Reactance: return "Reactance";
case YAxisType::Capacitance: return "Capacitance"; case YAxisType::Capacitance: return "Capacitance";
case YAxisType::Inductance: return "Inductance"; case YAxisType::Inductance: return "Inductance";
case YAxisType::QualityFactor: return "Quality Factor"; case YAxisType::QualityFactor: return "Quality Factor";
@ -904,6 +906,9 @@ QPointF TraceXYPlot::traceToCoordinate(Trace *t, unsigned int sample, TraceXYPlo
case YAxisType::SeriesR: case YAxisType::SeriesR:
ret.setY(Util::SparamToResistance(data.y)); ret.setY(Util::SparamToResistance(data.y));
break; break;
case YAxisType::Reactance:
ret.setY(Util::SparamToImpedance(data.y).imag());
break;
case YAxisType::Capacitance: case YAxisType::Capacitance:
ret.setY(Util::SparamToCapacitance(data.y, data.x)); ret.setY(Util::SparamToCapacitance(data.y, data.x));
break; break;

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

@ -21,6 +21,7 @@ public:
Imaginary, Imaginary,
// derived parameter options // derived parameter options
SeriesR, SeriesR,
Reactance,
Capacitance, Capacitance,
Inductance, Inductance,
QualityFactor, QualityFactor,

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

@ -191,6 +191,7 @@ std::set<TraceXYPlot::YAxisType> XYplotAxisDialog::supportedYAxis(TraceXYPlot::X
ret.insert(TraceXYPlot::YAxisType::Real); ret.insert(TraceXYPlot::YAxisType::Real);
ret.insert(TraceXYPlot::YAxisType::Imaginary); ret.insert(TraceXYPlot::YAxisType::Imaginary);
ret.insert(TraceXYPlot::YAxisType::SeriesR); ret.insert(TraceXYPlot::YAxisType::SeriesR);
ret.insert(TraceXYPlot::YAxisType::Reactance);
ret.insert(TraceXYPlot::YAxisType::Capacitance); ret.insert(TraceXYPlot::YAxisType::Capacitance);
ret.insert(TraceXYPlot::YAxisType::Inductance); ret.insert(TraceXYPlot::YAxisType::Inductance);
ret.insert(TraceXYPlot::YAxisType::QualityFactor); ret.insert(TraceXYPlot::YAxisType::QualityFactor);