jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-06 06:53:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Calculate additional parameters (R/L/C,...) for markers and traces

Browse source
This commit is contained in:
Jan Käberich 2021-06-27 23:40:50 +02:00
parent a232be3443
commit e27e594435
18 changed files with 168 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Software/PC_Application/Traces/xyplotaxisdialog.cpp
View file

@ -10,6 +10,13 @@ XYplotAxisDialog::XYplotAxisDialog(TraceXYPlot *plot) :
plot(plot)
{
ui->setupUi(this);
ui->Y1type->clear();
ui->Y2type->clear();
for(int i=0;i<(int) TraceXYPlot::YAxisType::Last;i++) {
ui->Y1type->addItem(TraceXYPlot::AxisTypeToName((TraceXYPlot::YAxisType) i));
ui->Y2type->addItem(TraceXYPlot::AxisTypeToName((TraceXYPlot::YAxisType) i));
}
// Setup GUI connections
connect(ui->Y1type, qOverload<int>(&QComboBox::currentIndexChanged), [this](int index) {
@ -69,7 +76,6 @@ XYplotAxisDialog::XYplotAxisDialog(TraceXYPlot *plot) :
connect(ui->XType, qOverload<int>(&QComboBox::currentIndexChanged), this, &XYplotAxisDialog::XAxisTypeChanged);
// Fill initial values
// assume same order in YAxisType enum as in ComboBox items
ui->Y1type->setCurrentIndex((int) plot->YAxis[0].type);
if(plot->YAxis[0].log) {
ui->Y1log->setChecked(true);
@ -175,6 +181,10 @@ std::set<TraceXYPlot::YAxisType> XYplotAxisDialog::supportedYAxis(TraceXYPlot::X
ret.insert(TraceXYPlot::YAxisType::Magnitude);
ret.insert(TraceXYPlot::YAxisType::Phase);
ret.insert(TraceXYPlot::YAxisType::VSWR);
ret.insert(TraceXYPlot::YAxisType::SeriesR);
ret.insert(TraceXYPlot::YAxisType::Capacitance);
ret.insert(TraceXYPlot::YAxisType::Inductance);
ret.insert(TraceXYPlot::YAxisType::QualityFactor);
break;
case TraceXYPlot::XAxisType::Time:
case TraceXYPlot::XAxisType::Distance: