From c0dce36a763924336ba3f2afc91f76369b4f69a6 Mon Sep 17 00:00:00 2001 From: Mark Zachmann Date: Fri, 19 Jun 2020 07:04:21 -0400 Subject: [PATCH] Repair a typo in calibration loading and remove the excess cal text --- NanoVNASaver/Calibration.py | 2 +- NanoVNASaver/Windows/CalibrationSettings.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NanoVNASaver/Calibration.py b/NanoVNASaver/Calibration.py index 23d8657..53f47ad 100644 --- a/NanoVNASaver/Calibration.py +++ b/NanoVNASaver/Calibration.py @@ -304,7 +304,7 @@ class Calibration: continue if line.startswith("#") and not parsed_header: # Check that this is a valid header - if line == ("# Hz ShortR ShortI OpenR OpenI LoadR Load" + if line == ("# Hz ShortR ShortI OpenR OpenI LoadR LoadI" " ThroughR ThroughI IsolationR IsolationI"): parsed_header = True continue diff --git a/NanoVNASaver/Windows/CalibrationSettings.py b/NanoVNASaver/Windows/CalibrationSettings.py index 46e8b00..ecc8392 100644 --- a/NanoVNASaver/Windows/CalibrationSettings.py +++ b/NanoVNASaver/Windows/CalibrationSettings.py @@ -575,7 +575,7 @@ class CalibrationWindow(QtWidgets.QWidget): valid, error = self.app.calibration.calculateCorrections() if valid: self.calibration_status_label.setText( - f"Application calibration ({self.app.calibration.s11short} points)") + f"Application calibration ({len(self.app.calibration.s11short)} points)") if self.use_ideal_values.isChecked(): self.calibration_source_label.setText(self.app.calibration.source) else: @@ -611,16 +611,16 @@ class CalibrationWindow(QtWidgets.QWidget): self.app.calibration.loadCalibration(filename) if self.app.calibration.isValid1Port(): self.cal_short_label.setText( - f"Loaded ({self.app.calibration.s11short})") + f"Loaded ({len(self.app.calibration.s11short)})") self.cal_open_label.setText( - f"Loaded ({self.app.calibration.s11open})") + f"Loaded ({len(self.app.calibration.s11open)})") self.cal_load_label.setText( - f"Loaded ({self.app.calibration.s11load})") + f"Loaded ({len(self.app.calibration.s11load)})") if self.app.calibration.isValid2Port(): self.cal_through_label.setText( - f"Loaded ({self.app.calibration.s21through})") + f"Loaded ({len(self.app.calibration.s21through)})") self.cal_isolation_label.setText( - f"Loaded ({self.app.calibration.s21isolation})") + f"Loaded ({len(self.app.calibration.s21isolation)})") self.calculate() self.notes_textedit.clear() for note in self.app.calibration.notes: