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

Bugfix: Use correct Z0 in calibration kit parsing

Browse Source
This commit is contained in:
Jan Käberich 2020-11-09 15:20:19 +01:00
parent c3b52165f7
commit 3f66bdda48
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Software/PC_Application/Calibration/calkit.cpp
View File

@ -172,6 +172,12 @@ Calkit Calkit::fromFile(std::string filename)
c.TransformPathsToAbsolute(QString::fromStdString(filename)); c.TransformPathsToAbsolute(QString::fromStdString(filename));
// set default values for non-editable items (for now)
c.TRL.Through.Z0 = 50.0;
c.SOLT.Short.Z0 = 50.0;
c.SOLT.Open.Z0 = 50.0;
c.SOLT.Through.Z0 = 50.0;
return c; return c;
} }

17
Software/PC_Application/Calibration/calkitdialog.cpp
View File

@ -47,6 +47,7 @@ CalkitDialog::CalkitDialog(Calkit &c, QWidget *parent) :
ui->load_serL->setPrefixes("fpnum "); ui->load_serL->setPrefixes("fpnum ");
ui->through_Z0->setUnit("Ω"); ui->through_Z0->setUnit("Ω");
ui->TRL_through_Z0->setUnit("Ω");
ui->TRL_line_max->setUnit("Hz"); ui->TRL_line_max->setUnit("Hz");
ui->TRL_line_max->setPrecision(4); ui->TRL_line_max->setPrecision(4);
ui->TRL_line_max->setPrefixes(" kMG"); ui->TRL_line_max->setPrefixes(" kMG");
@ -190,7 +191,7 @@ void CalkitDialog::parseEntries()
ownKit.SOLT.Through.Sparam2 = ui->through_touchstone->getPorts()[1]; ownKit.SOLT.Through.Sparam2 = ui->through_touchstone->getPorts()[1];
// TRL // TRL
ownKit.TRL.Through.Z0 = ui->TRL_through_Z0->text().toDouble(); ownKit.TRL.Through.Z0 = ui->TRL_through_Z0->value();
ownKit.TRL.Reflection.isShort = ui->TRL_R_short->isChecked(); ownKit.TRL.Reflection.isShort = ui->TRL_R_short->isChecked();
ownKit.TRL.Line.delay = ui->TRL_line_delay->text().toDouble(); ownKit.TRL.Line.delay = ui->TRL_line_delay->text().toDouble();
ownKit.TRL.Line.minFreq = ui->TRL_line_min->value(); ownKit.TRL.Line.minFreq = ui->TRL_line_min->value();
@ -202,7 +203,7 @@ void CalkitDialog::parseEntries()
void CalkitDialog::updateEntries() void CalkitDialog::updateEntries()
{ {
// Coefficients // Coefficients
ui->open_Z0->setValue(ownKit.SOLT.Open.Z0); ui->open_Z0->setValueQuiet(ownKit.SOLT.Open.Z0);
ui->open_delay->setText(QString::number(ownKit.SOLT.Open.delay)); ui->open_delay->setText(QString::number(ownKit.SOLT.Open.delay));
ui->open_loss->setText(QString::number(ownKit.SOLT.Open.loss)); ui->open_loss->setText(QString::number(ownKit.SOLT.Open.loss));
ui->open_C0->setText(QString::number(ownKit.SOLT.Open.C0)); ui->open_C0->setText(QString::number(ownKit.SOLT.Open.C0));
@ -210,7 +211,7 @@ void CalkitDialog::updateEntries()
ui->open_C2->setText(QString::number(ownKit.SOLT.Open.C2)); ui->open_C2->setText(QString::number(ownKit.SOLT.Open.C2));
ui->open_C3->setText(QString::number(ownKit.SOLT.Open.C3)); ui->open_C3->setText(QString::number(ownKit.SOLT.Open.C3));
ui->short_Z0->setValue(ownKit.SOLT.Short.Z0); ui->short_Z0->setValueQuiet(ownKit.SOLT.Short.Z0);
ui->short_delay->setText(QString::number(ownKit.SOLT.Short.delay)); ui->short_delay->setText(QString::number(ownKit.SOLT.Short.delay));
ui->short_loss->setText(QString::number(ownKit.SOLT.Short.loss)); ui->short_loss->setText(QString::number(ownKit.SOLT.Short.loss));
ui->short_L0->setText(QString::number(ownKit.SOLT.Short.L0)); ui->short_L0->setText(QString::number(ownKit.SOLT.Short.L0));
@ -218,12 +219,12 @@ void CalkitDialog::updateEntries()
ui->short_L2->setText(QString::number(ownKit.SOLT.Short.L2)); ui->short_L2->setText(QString::number(ownKit.SOLT.Short.L2));
ui->short_L3->setText(QString::number(ownKit.SOLT.Short.L3)); ui->short_L3->setText(QString::number(ownKit.SOLT.Short.L3));
ui->load_Z0->setValue(ownKit.SOLT.Load.Z0); ui->load_Z0->setValueQuiet(ownKit.SOLT.Load.Z0);
ui->load_delay->setText(QString::number(ownKit.SOLT.Load.delay)); ui->load_delay->setText(QString::number(ownKit.SOLT.Load.delay));
ui->load_parC->setValue(ownKit.SOLT.Load.Cparallel); ui->load_parC->setValueQuiet(ownKit.SOLT.Load.Cparallel);
ui->load_serL->setValue(ownKit.SOLT.Load.Lseries); ui->load_serL->setValueQuiet(ownKit.SOLT.Load.Lseries);
ui->through_Z0->setText(QString::number(ownKit.SOLT.Through.Z0)); ui->through_Z0->setValueQuiet(ownKit.SOLT.Through.Z0);
ui->through_delay->setText(QString::number(ownKit.SOLT.Through.delay)); ui->through_delay->setText(QString::number(ownKit.SOLT.Through.delay));
ui->through_loss->setText(QString::number(ownKit.SOLT.Through.loss)); ui->through_loss->setText(QString::number(ownKit.SOLT.Through.loss));
@ -267,7 +268,7 @@ void CalkitDialog::updateEntries()
} }
// TRL // TRL
ui->TRL_through_Z0->setText(QString::number(ownKit.TRL.Through.Z0)); ui->TRL_through_Z0->setValueQuiet(ownKit.TRL.Through.Z0);
if(ownKit.TRL.Reflection.isShort) { if(ownKit.TRL.Reflection.isShort) {
ui->TRL_R_short->setChecked(true); ui->TRL_R_short->setChecked(true);
} else { } else {

4
Software/PC_Application/Calibration/calkitdialog.ui
View File

@ -32,7 +32,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@ -586,7 +586,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="TRL_through_Z0"> <widget class="SIUnitEdit" name="TRL_through_Z0">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>