diff --git a/Software/PC_Application/LibreVNA-GUI b/Software/PC_Application/LibreVNA-GUI index 065884f..1b32f8a 100755 Binary files a/Software/PC_Application/LibreVNA-GUI and b/Software/PC_Application/LibreVNA-GUI differ diff --git a/Software/PC_Application/Traces/tracexyplot.cpp b/Software/PC_Application/Traces/tracexyplot.cpp index 503d1f8..4b0616f 100644 --- a/Software/PC_Application/Traces/tracexyplot.cpp +++ b/Software/PC_Application/Traces/tracexyplot.cpp @@ -22,6 +22,7 @@ const set TraceXYPlot::YAxisTypes = {TraceXYPlot::YAxisT TraceXYPlot::YAxisType::Real, TraceXYPlot::YAxisType::Imaginary, TraceXYPlot::YAxisType::SeriesR, + TraceXYPlot::YAxisType::Reactance, TraceXYPlot::YAxisType::Capacitance, TraceXYPlot::YAxisType::Inductance, TraceXYPlot::YAxisType::QualityFactor, @@ -791,6 +792,7 @@ QString TraceXYPlot::AxisTypeToName(TraceXYPlot::YAxisType type) case YAxisType::Real: return "Real (R)"; case YAxisType::Imaginary: return "Imaginary (X)"; case YAxisType::SeriesR: return "Resistance"; + case YAxisType::Reactance: return "Reactance"; case YAxisType::Capacitance: return "Capacitance"; case YAxisType::Inductance: return "Inductance"; case YAxisType::QualityFactor: return "Quality Factor"; @@ -904,6 +906,9 @@ QPointF TraceXYPlot::traceToCoordinate(Trace *t, unsigned int sample, TraceXYPlo case YAxisType::SeriesR: ret.setY(Util::SparamToResistance(data.y)); break; + case YAxisType::Reactance: + ret.setY(Util::SparamToImpedance(data.y).imag()); + break; case YAxisType::Capacitance: ret.setY(Util::SparamToCapacitance(data.y, data.x)); break; diff --git a/Software/PC_Application/Traces/tracexyplot.h b/Software/PC_Application/Traces/tracexyplot.h index 3b256da..969bf65 100644 --- a/Software/PC_Application/Traces/tracexyplot.h +++ b/Software/PC_Application/Traces/tracexyplot.h @@ -21,6 +21,7 @@ public: Imaginary, // derived parameter options SeriesR, + Reactance, Capacitance, Inductance, QualityFactor, diff --git a/Software/PC_Application/Traces/xyplotaxisdialog.cpp b/Software/PC_Application/Traces/xyplotaxisdialog.cpp index 0c8e49d..0a9c381 100644 --- a/Software/PC_Application/Traces/xyplotaxisdialog.cpp +++ b/Software/PC_Application/Traces/xyplotaxisdialog.cpp @@ -191,6 +191,7 @@ std::set XYplotAxisDialog::supportedYAxis(TraceXYPlot::X ret.insert(TraceXYPlot::YAxisType::Real); ret.insert(TraceXYPlot::YAxisType::Imaginary); ret.insert(TraceXYPlot::YAxisType::SeriesR); + ret.insert(TraceXYPlot::YAxisType::Reactance); ret.insert(TraceXYPlot::YAxisType::Capacitance); ret.insert(TraceXYPlot::YAxisType::Inductance); ret.insert(TraceXYPlot::YAxisType::QualityFactor);