From 7ceaee10502bfe3196cb5e27f60b94632e2469c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Sun, 30 Jan 2022 20:35:13 +0100
Subject: [PATCH] Add missing units for XAxisTypes

---
 Software/PC_Application/Traces/tracexyplot.cpp      | 11 ++++++++++-
 Software/PC_Application/Traces/xyplotaxisdialog.cpp |  8 ++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Software/PC_Application/Traces/tracexyplot.cpp b/Software/PC_Application/Traces/tracexyplot.cpp
index fc067a4..2322e28 100644
--- a/Software/PC_Application/Traces/tracexyplot.cpp
+++ b/Software/PC_Application/Traces/tracexyplot.cpp
@@ -1239,7 +1239,16 @@ QString TraceXYPlot::AxisUnit(TraceXYPlot::YAxisType type)
         case TraceXYPlot::YAxisType::Step: return "";
         case TraceXYPlot::YAxisType::Impedance: return "Ohm";
         case TraceXYPlot::YAxisType::GroupDelay: return "s";
-        default: return "";
+        case TraceXYPlot::YAxisType::Disabled:
+        case TraceXYPlot::YAxisType::Real:
+        case TraceXYPlot::YAxisType::Imaginary:
+        case TraceXYPlot::YAxisType::QualityFactor:
+            return "";
+        case TraceXYPlot::YAxisType::SeriesR: return "Ω";
+        case TraceXYPlot::YAxisType::Reactance: return "Ω";
+        case TraceXYPlot::YAxisType::Capacitance: return "F";
+        case TraceXYPlot::YAxisType::Inductance: return "H";
+        case TraceXYPlot::YAxisType::Last: return "";
         }
     } else if(source == TraceModel::DataSource::SA) {
         switch(type) {
diff --git a/Software/PC_Application/Traces/xyplotaxisdialog.cpp b/Software/PC_Application/Traces/xyplotaxisdialog.cpp
index b6ead55..cd63798 100644
--- a/Software/PC_Application/Traces/xyplotaxisdialog.cpp
+++ b/Software/PC_Application/Traces/xyplotaxisdialog.cpp
@@ -96,6 +96,14 @@ XYplotAxisDialog::XYplotAxisDialog(TraceXYPlot *plot) :
     ui->Xmax->setPrefixes("pnum kMG");
     ui->Xdivs->setPrefixes("pnum kMG");
 
+    ui->Y1min->setPrefixes("pnum kMG");
+    ui->Y1max->setPrefixes("pnum kMG");
+    ui->Y1divs->setPrefixes("pnum kMG");
+
+    ui->Y2min->setPrefixes("pnum kMG");
+    ui->Y2max->setPrefixes("pnum kMG");
+    ui->Y2divs->setPrefixes("pnum kMG");
+
     XAxisTypeChanged((int) plot->XAxis.type);
     connect(ui->XType, qOverload<int>(&QComboBox::currentIndexChanged), this, &XYplotAxisDialog::XAxisTypeChanged);
     connect(ui->Xlog, &QCheckBox::toggled, [=](bool checked){