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

Add missing units for XAxisTypes

Browse Source
This commit is contained in:
Jan Käberich 2022-01-30 20:35:13 +01:00
parent cb5f472c47
commit 7ceaee1050
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1239,7 +1239,16 @@ QString TraceXYPlot::AxisUnit(TraceXYPlot::YAxisType type)
case TraceXYPlot::YAxisType::Step: return ""; case TraceXYPlot::YAxisType::Step: return "";
case TraceXYPlot::YAxisType::Impedance: return "Ohm"; case TraceXYPlot::YAxisType::Impedance: return "Ohm";
case TraceXYPlot::YAxisType::GroupDelay: return "s"; 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) { } else if(source == TraceModel::DataSource::SA) {
switch(type) { switch(type) {

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

@ -96,6 +96,14 @@ XYplotAxisDialog::XYplotAxisDialog(TraceXYPlot *plot) :
ui->Xmax->setPrefixes("pnum kMG"); ui->Xmax->setPrefixes("pnum kMG");
ui->Xdivs->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); XAxisTypeChanged((int) plot->XAxis.type);
connect(ui->XType, qOverload<int>(&QComboBox::currentIndexChanged), this, &XYplotAxisDialog::XAxisTypeChanged); connect(ui->XType, qOverload<int>(&QComboBox::currentIndexChanged), this, &XYplotAxisDialog::XAxisTypeChanged);
connect(ui->Xlog, &QCheckBox::toggled, [=](bool checked){ connect(ui->Xlog, &QCheckBox::toggled, [=](bool checked){