From e70aa7d3e1141c7f68c921cd08b9b2b3f9b14ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Mon, 29 Jun 2020 18:46:15 +0200 Subject: [PATCH] Fixed cal crash and s21 cals --- NanoVNASaver/Windows/CalibrationSettings.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/NanoVNASaver/Windows/CalibrationSettings.py b/NanoVNASaver/Windows/CalibrationSettings.py index 42946fc..8e2c87b 100644 --- a/NanoVNASaver/Windows/CalibrationSettings.py +++ b/NanoVNASaver/Windows/CalibrationSettings.py @@ -228,12 +228,15 @@ class CalibrationWindow(QtWidgets.QWidget): return False return True - def cal_save(self, name): - self.app.calibration.cals[name] = self.app.data + def cal_save(self, name: str): + if name in ("through", "isolation"): + self.app.calibration.cals[name] = self.app.data21[:] + else: + self.app.calibration.cals[name] = self.app.data[:] self.cal_label[name].setText( _format_cal_label(self.app.data)) - def manual_save(self, name): + def manual_save(self, name: str): if self.checkExpertUser(): self.cal_save(name) @@ -639,7 +642,7 @@ class CalibrationWindow(QtWidgets.QWidget): self.btn_automatic.setDisabled(False) return - if self.app.sweepSettingsWindow.continuous_sweep_radiobutton.isChecked(): + if self.app.windows["sweep_settings"].continuous_sweep_radiobutton.isChecked(): QtWidgets.QMessageBox( QtWidgets.QMessageBox.Information, "Continuous sweep enabled",