nqrduck/nqrduck-autotm
1
0
Fork 0
mirror of https://github.com/nqrduck/nqrduck-autotm.git synced 2024-09-19 19:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added proper display and handling of serial connection.

Browse source
This commit is contained in:
jupfi 2023-08-21 09:37:00 +02:00
parent 912ffe1933
commit f45ca6a574
3 changed files with 188 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
src/nqrduck_autotm/controller.py
View file

@ -24,17 +24,41 @@ class AutoTMController(ModuleController):
for device in self.module.model.available_devices: for device in self.module.model.available_devices:
logger.debug("Found device: %s", device) logger.debug("Found device: %s", device)
def connect(self, device: str) -> None: def handle_connection(self, device: str) -> None:
"""Connect to the specified device. """Connect or disconnect to the specified device based on if there already is a connection.
Args: Args:
device (str): The device port to connect to.""" device (str): The device port to connect to.
@TODO: If the user actually want to connect to another device while already connected to one,
this would have to be handled differently. But this doesn't really make sense in the current implementation.
"""
logger.debug("Connecting to device %s", device) logger.debug("Connecting to device %s", device)
# If the user has already connected to a device, close the previous connection
if self.module.model.serial is not None:
if self.module.model.serial.isOpen():
logger.debug("Closing previous connection")
serial = self.module.model.serial
serial.close()
self.module.model.serial = serial
else:
self.open_connection(device)
# This is just for the first time the user connects to the device
else:
self.open_connection(device)
def open_connection(self, device: str) -> None:
"""Open a connection to the specified device.
Args:
device (str): The device port to connect to.
"""
try: try:
self.module.model.serial = QtSerialPort.QSerialPort( serial = QtSerialPort.QSerialPort(
device, baudRate=self.BAUDRATE, readyRead=self.on_ready_read device, baudRate=self.BAUDRATE, readyRead=self.on_ready_read
) )
self.module.model.serial.open(QtSerialPort.QSerialPort.OpenModeFlag.ReadWrite) serial.open(QtSerialPort.QSerialPort.OpenModeFlag.ReadWrite)
self.module.model.serial = serial
logger.debug("Connected to device %s", device) logger.debug("Connected to device %s", device)
except Exception as e: except Exception as e:
@ -77,9 +101,12 @@ class AutoTMController(ModuleController):
return return
if start_frequency < MIN_FREQUENCY or stop_frequency > MAX_FREQUENCY: if start_frequency < MIN_FREQUENCY or stop_frequency > MAX_FREQUENCY:
error = "Could not start frequency sweep. Start and stop frequency must be between %s and %s MHz" % ( error = (
MIN_FREQUENCY / 1e6, "Could not start frequency sweep. Start and stop frequency must be between %s and %s MHz"
MAX_FREQUENCY / 1e6, % (
MIN_FREQUENCY / 1e6,
MAX_FREQUENCY / 1e6,
)
) )
logger.error(error) logger.error(error)
self.module.view.add_info_text(error) self.module.view.add_info_text(error)
@ -108,7 +135,10 @@ class AutoTMController(ModuleController):
# logger.debug("Received data: %s", text) # logger.debug("Received data: %s", text)
# If the text starts with 'f' and the frequency sweep spinner is visible we know that the data is a data point # If the text starts with 'f' and the frequency sweep spinner is visible we know that the data is a data point
# then we have the data for the return loss and the phase at a certain frequency # then we have the data for the return loss and the phase at a certain frequency
if text.startswith("f") and self.module.view.frequency_sweep_spinner.isVisible(): if (
text.startswith("f")
and self.module.view.frequency_sweep_spinner.isVisible()
):
text = text[1:].split("r") text = text[1:].split("r")
frequency = float(text[0]) frequency = float(text[0])
return_loss, phase = map(float, text[1].split("p")) return_loss, phase = map(float, text[1].split("p"))
@ -116,24 +146,38 @@ class AutoTMController(ModuleController):
# If the text starts with 'r' and no calibration is active we know that the data is a measurement # If the text starts with 'r' and no calibration is active we know that the data is a measurement
elif text.startswith("r") and self.module.model.active_calibration == None: elif text.startswith("r") and self.module.model.active_calibration == None:
logger.debug("Measurement finished") logger.debug("Measurement finished")
self.module.model.measurement = S11Data(self.module.model.data_points.copy()) self.module.model.measurement = S11Data(
self.module.model.data_points.copy()
)
self.module.view.frequency_sweep_spinner.hide() self.module.view.frequency_sweep_spinner.hide()
# If the text starts with 'r' and a short calibration is active we know that the data is a short calibration # If the text starts with 'r' and a short calibration is active we know that the data is a short calibration
elif text.startswith("r") and self.module.model.active_calibration == "short": elif (
text.startswith("r") and self.module.model.active_calibration == "short"
):
logger.debug("Short calibration finished") logger.debug("Short calibration finished")
self.module.model.short_calibration = S11Data(self.module.model.data_points.copy()) self.module.model.short_calibration = S11Data(
self.module.model.data_points.copy()
)
self.module.model.active_calibration = None self.module.model.active_calibration = None
self.module.view.frequency_sweep_spinner.hide() self.module.view.frequency_sweep_spinner.hide()
# If the text starts with 'r' and an open calibration is active we know that the data is an open calibration # If the text starts with 'r' and an open calibration is active we know that the data is an open calibration
elif text.startswith("r") and self.module.model.active_calibration == "open": elif (
text.startswith("r") and self.module.model.active_calibration == "open"
):
logger.debug("Open calibration finished") logger.debug("Open calibration finished")
self.module.model.open_calibration = S11Data(self.module.model.data_points.copy()) self.module.model.open_calibration = S11Data(
self.module.model.data_points.copy()
)
self.module.model.active_calibration = None self.module.model.active_calibration = None
self.module.view.frequency_sweep_spinner.hide() self.module.view.frequency_sweep_spinner.hide()
# If the text starts with 'r' and a load calibration is active we know that the data is a load calibration # If the text starts with 'r' and a load calibration is active we know that the data is a load calibration
elif text.startswith("r") and self.module.model.active_calibration == "load": elif (
text.startswith("r") and self.module.model.active_calibration == "load"
):
logger.debug("Load calibration finished") logger.debug("Load calibration finished")
self.module.model.load_calibration = S11Data(self.module.model.data_points.copy()) self.module.model.load_calibration = S11Data(
self.module.model.data_points.copy()
)
self.module.model.active_calibration = None self.module.model.active_calibration = None
self.module.view.frequency_sweep_spinner.hide() self.module.view.frequency_sweep_spinner.hide()
# If the text starts with 'i' we know that the data is an info message # If the text starts with 'i' we know that the data is an info message
@ -167,7 +211,9 @@ class AutoTMController(ModuleController):
logger.debug("Starting next voltage sweep: %s", command) logger.debug("Starting next voltage sweep: %s", command)
self.send_command(command) self.send_command(command)
def on_short_calibration(self, start_frequency: float, stop_frequency: float) -> None: def on_short_calibration(
self, start_frequency: float, stop_frequency: float
) -> None:
"""This method is called when the short calibration button is pressed. """This method is called when the short calibration button is pressed.
It starts a frequency sweep in the specified range and then starts a short calibration. It starts a frequency sweep in the specified range and then starts a short calibration.
""" """
@ -175,7 +221,9 @@ class AutoTMController(ModuleController):
self.module.model.init_short_calibration() self.module.model.init_short_calibration()
self.start_frequency_sweep(start_frequency, stop_frequency) self.start_frequency_sweep(start_frequency, stop_frequency)
def on_open_calibration(self, start_frequency: float, stop_frequency: float) -> None: def on_open_calibration(
self, start_frequency: float, stop_frequency: float
) -> None:
"""This method is called when the open calibration button is pressed. """This method is called when the open calibration button is pressed.
It starts a frequency sweep in the specified range and then starts an open calibration. It starts a frequency sweep in the specified range and then starts an open calibration.
""" """
@ -183,7 +231,9 @@ class AutoTMController(ModuleController):
self.module.model.init_open_calibration() self.module.model.init_open_calibration()
self.start_frequency_sweep(start_frequency, stop_frequency) self.start_frequency_sweep(start_frequency, stop_frequency)
def on_load_calibration(self, start_frequency: float, stop_frequency: float) -> None: def on_load_calibration(
self, start_frequency: float, stop_frequency: float
) -> None:
"""This method is called when the load calibration button is pressed. """This method is called when the load calibration button is pressed.
It starts a frequency sweep in the specified range and then loads a calibration. It starts a frequency sweep in the specified range and then loads a calibration.
""" """
@ -205,13 +255,19 @@ class AutoTMController(ModuleController):
logger.debug("Calculating calibration") logger.debug("Calculating calibration")
# First we check if the short and open calibration data points are available # First we check if the short and open calibration data points are available
if self.module.model.short_calibration == None: if self.module.model.short_calibration == None:
logger.error("Could not calculate calibration. No short calibration data points available.") logger.error(
"Could not calculate calibration. No short calibration data points available."
)
return return
if self.module.model.open_calibration == None: if self.module.model.open_calibration == None:
logger.error("Could not calculate calibration. No open calibration data points available.") logger.error(
"Could not calculate calibration. No open calibration data points available."
)
return return
if self.module.model.load_calibration == None: if self.module.model.load_calibration == None:
logger.error("Could not calculate calibration. No load calibration data points available.") logger.error(
"Could not calculate calibration. No load calibration data points available."
)
return return
# Then we calculate the calibration # Then we calculate the calibration
@ -226,7 +282,9 @@ class AutoTMController(ModuleController):
e_00s = [] e_00s = []
e_11s = [] e_11s = []
delta_es = [] delta_es = []
for gamma_s, gamma_o, gamma_l in zip(measured_gamma_short, measured_gamma_open, measured_gamma_load): for gamma_s, gamma_o, gamma_l in zip(
measured_gamma_short, measured_gamma_open, measured_gamma_load
):
# This is the solution from # This is the solution from
A = np.array( A = np.array(
[ [
@ -257,15 +315,21 @@ class AutoTMController(ModuleController):
logger.debug("Exporting calibration") logger.debug("Exporting calibration")
# First we check if the short and open calibration data points are available # First we check if the short and open calibration data points are available
if self.module.model.short_calibration == None: if self.module.model.short_calibration == None:
logger.error("Could not export calibration. No short calibration data points available.") logger.error(
"Could not export calibration. No short calibration data points available."
)
return return
if self.module.model.open_calibration == None: if self.module.model.open_calibration == None:
logger.error("Could not export calibration. No open calibration data points available.") logger.error(
"Could not export calibration. No open calibration data points available."
)
return return
if self.module.model.load_calibration == None: if self.module.model.load_calibration == None:
logger.error("Could not export calibration. No load calibration data points available.") logger.error(
"Could not export calibration. No load calibration data points available."
)
return return
# Then we export the different calibrations as a json file # Then we export the different calibrations as a json file
@ -316,7 +380,9 @@ class AutoTMController(ModuleController):
return return
if tuning_voltage < 0 or matching_voltage < 0: if tuning_voltage < 0 or matching_voltage < 0:
error = "Could not set voltages. Tuning and matching voltage must be positive" error = (
"Could not set voltages. Tuning and matching voltage must be positive"
)
logger.error(error) logger.error(error)
self.module.view.add_info_text(error) self.module.view.add_info_text(error)
return return
@ -368,7 +434,12 @@ class AutoTMController(ModuleController):
self.module.view.add_info_text(error) self.module.view.add_info_text(error)
return return
if start_frequency < 0 or stop_frequency < 0 or frequency_step < 0 or voltage_resolution < 0: if (
start_frequency < 0
or stop_frequency < 0
or frequency_step < 0
or voltage_resolution < 0
):
error = "Could not generate LUT. Start frequency, stop frequency, frequency step and voltage resolution must be positive" error = "Could not generate LUT. Start frequency, stop frequency, frequency step and voltage resolution must be positive"
logger.error(error) logger.error(error)
self.module.view.add_info_text(error) self.module.view.add_info_text(error)
@ -395,7 +466,9 @@ class AutoTMController(ModuleController):
) )
# We create the lookup table # We create the lookup table
LUT = LookupTable(start_frequency, stop_frequency, frequency_step, voltage_resolution) LUT = LookupTable(
start_frequency, stop_frequency, frequency_step, voltage_resolution
)
LUT.started_frequency = start_frequency LUT.started_frequency = start_frequency
self.module.model.LUT = LUT self.module.model.LUT = LUT
@ -405,22 +478,21 @@ class AutoTMController(ModuleController):
self.send_command(command) self.send_command(command)
def switch_to_preamp(self) -> None: def switch_to_preamp(self) -> None:
""" This method is used to send the command 'cp' to the atm system. This switches the signal pathway of the atm system to 'RX' to 'Preamp'. """This method is used to send the command 'cp' to the atm system. This switches the signal pathway of the atm system to 'RX' to 'Preamp'.
This is the mode for either NQR or NMR measurements or if on wants to check the tuning of the probe coil on a network analyzer. This is the mode for either NQR or NMR measurements or if on wants to check the tuning of the probe coil on a network analyzer.
""" """
logger.debug("Switching to preamp") logger.debug("Switching to preamp")
self.send_command("cp") self.send_command("cp")
def switch_to_atm(self) -> None: def switch_to_atm(self) -> None:
""" This method is used to send the command 'ca' to the atm system. This switches the signal pathway of the atm system to 'RX' to 'ATM. """This method is used to send the command 'ca' to the atm system. This switches the signal pathway of the atm system to 'RX' to 'ATM.
In this state the atm system can be used to measure the reflection coefficient of the probecoils. In this state the atm system can be used to measure the reflection coefficient of the probecoils.
""" """
logger.debug("Switching to atm") logger.debug("Switching to atm")
self.send_command("ca") self.send_command("ca")
def send_command(self, command : str) -> None: def send_command(self, command: str) -> None:
""" This method is used to send a command to the active serial connection. """This method is used to send a command to the active serial connection.
Args: Args:
command (str): The command that should be send to the atm system. command (str): The command that should be send to the atm system.
@ -434,13 +506,13 @@ class AutoTMController(ModuleController):
QApplication.processEvents() QApplication.processEvents()
except AttributeError: except AttributeError:
logger.error("Could not send command. No device connected.") logger.error("Could not send command. No device connected.")
self.module.view.add_error_text("Could not send command. No device connected.") self.module.view.add_error_text(
"Could not send command. No device connected."
)
def homing(self) -> None: def homing(self) -> None:
""" This method is used to send the command 'h' to the atm system. """This method is used to send the command 'h' to the atm system.
This command is used to home the stepper motors of the atm system. This command is used to home the stepper motors of the atm system.
""" """
logger.debug("Homing") logger.debug("Homing")
self.send_command("h") self.send_command("h")

1
src/nqrduck_autotm/model.py
View file

@ -148,6 +148,7 @@ class AutoTMModel(ModuleModel):
self.data_points = [] self.data_points = []
self.active_calibration = None self.active_calibration = None
self.calibration = None self.calibration = None
self.serial = None
@property @property
def available_devices(self): def available_devices(self):

85
src/nqrduck_autotm/view.py
View file

@ -45,7 +45,9 @@ class AutoTMView(ModuleView):
self._ui_form.refreshButton.clicked.connect(self.module.controller.find_devices) self._ui_form.refreshButton.clicked.connect(self.module.controller.find_devices)
# Connect the available devices changed signal to the on_available_devices_changed slot # Connect the available devices changed signal to the on_available_devices_changed slot
self.module.model.available_devices_changed.connect(self.on_available_devices_changed) self.module.model.available_devices_changed.connect(
self.on_available_devices_changed
)
# Connect the serial changed signal to the on_serial_changed slot # Connect the serial changed signal to the on_serial_changed slot
self.module.model.serial_changed.connect(self.on_serial_changed) self.module.model.serial_changed.connect(self.on_serial_changed)
@ -81,13 +83,19 @@ class AutoTMView(ModuleView):
) )
# On clicking of the calibration button call the on_calibration_button_clicked method # On clicking of the calibration button call the on_calibration_button_clicked method
self._ui_form.calibrationButton.clicked.connect(self.on_calibration_button_clicked) self._ui_form.calibrationButton.clicked.connect(
self.on_calibration_button_clicked
)
# On clicking of the switchpreampButton call the switch_preamp method # On clicking of the switchpreampButton call the switch_preamp method
self._ui_form.switchpreampButton.clicked.connect(self.module.controller.switch_to_preamp) self._ui_form.switchpreampButton.clicked.connect(
self.module.controller.switch_to_preamp
)
# On clicking of the switchATMButton call the switch_atm method # On clicking of the switchATMButton call the switch_atm method
self._ui_form.switchATMButton.clicked.connect(self.module.controller.switch_to_atm) self._ui_form.switchATMButton.clicked.connect(
self.module.controller.switch_to_atm
)
# On clicking of the homingButton call the homing method # On clicking of the homingButton call the homing method
self._ui_form.homingButton.clicked.connect(self.module.controller.homing) self._ui_form.homingButton.clicked.connect(self.module.controller.homing)
@ -97,7 +105,9 @@ class AutoTMView(ModuleView):
# Add a vertical layout to the info box # Add a vertical layout to the info box
self._ui_form.scrollAreaWidgetContents.setLayout(QVBoxLayout()) self._ui_form.scrollAreaWidgetContents.setLayout(QVBoxLayout())
self._ui_form.scrollAreaWidgetContents.layout().setAlignment(Qt.AlignmentFlag.AlignTop) self._ui_form.scrollAreaWidgetContents.layout().setAlignment(
Qt.AlignmentFlag.AlignTop
)
self.init_plot() self.init_plot()
self.init_labels() self.init_labels()
@ -150,7 +160,7 @@ class AutoTMView(ModuleView):
""" """
logger.debug("Connect button clicked") logger.debug("Connect button clicked")
selected_device = self._ui_form.portBox.currentText() selected_device = self._ui_form.portBox.currentText()
self.module.controller.connect(selected_device) self.module.controller.handle_connection(selected_device)
@pyqtSlot(QSerialPort) @pyqtSlot(QSerialPort)
def on_serial_changed(self, serial: QSerialPort) -> None: def on_serial_changed(self, serial: QSerialPort) -> None:
@ -159,11 +169,16 @@ class AutoTMView(ModuleView):
Args: Args:
serial (serial.Serial): The current serial connection.""" serial (serial.Serial): The current serial connection."""
logger.debug("Updating serial connection label") logger.debug("Updating serial connection label")
if serial: if serial.isOpen():
self._ui_form.connectionLabel.setText(serial.portName()) self._ui_form.connectionLabel.setText(serial.portName())
self.add_info_text("Connected to device %s" % serial.portName()) self.add_info_text("Connected to device %s" % serial.portName())
# Change the connectButton to a disconnectButton
self._ui_form.connectButton.setText("Disconnect")
else: else:
self._ui_form.connectionLabel.setText("Disconnected") self._ui_form.connectionLabel.setText("Disconnected")
self.add_info_text("Disconnected from device")
self._ui_form.connectButton.setText("Connect")
logger.debug("Updated serial connection label") logger.debug("Updated serial connection label")
def plot_measurement(self, data: "S11Data") -> None: def plot_measurement(self, data: "S11Data") -> None:
@ -190,17 +205,19 @@ class AutoTMView(ModuleView):
# Calibration for visualization happens here. # Calibration for visualization happens here.
if self.module.model.calibration is not None: if self.module.model.calibration is not None:
calibration = self.module.model.calibration calibration = self.module.model.calibration
e_00 = calibration[0] e_00 = calibration[0]
e11 = calibration[1] e11 = calibration[1]
delta_e = calibration[2] delta_e = calibration[2]
gamma_corr = [ gamma_corr = [
(data_point - e_00[i]) / (data_point * e11[i] - delta_e[i]) for i, data_point in enumerate(gamma) (data_point - e_00[i]) / (data_point * e11[i] - delta_e[i])
for i, data_point in enumerate(gamma)
] ]
return_loss_db_corr = [-20 * cmath.log10(abs(g + 1e-12)) for g in gamma_corr] return_loss_db_corr = [
-20 * cmath.log10(abs(g + 1e-12)) for g in gamma_corr
]
magnitude_ax.plot(frequency, return_loss_db_corr, color="red") magnitude_ax.plot(frequency, return_loss_db_corr, color="red")
else: else:
@ -236,7 +253,9 @@ class AutoTMView(ModuleView):
text_label = QLabel(text) text_label = QLabel(text)
text_label.setStyleSheet("font-size: 25px;") text_label.setStyleSheet("font-size: 25px;")
self._ui_form.scrollAreaWidgetContents.layout().addWidget(text_label) self._ui_form.scrollAreaWidgetContents.layout().addWidget(text_label)
self._ui_form.scrollArea.verticalScrollBar().setValue(self._ui_form.scrollArea.verticalScrollBar().maximum()) self._ui_form.scrollArea.verticalScrollBar().setValue(
self._ui_form.scrollArea.verticalScrollBar().maximum()
)
def add_error_text(self, text: str) -> None: def add_error_text(self, text: str) -> None:
"""Adds text to the error text box. """Adds text to the error text box.
@ -250,7 +269,9 @@ class AutoTMView(ModuleView):
text_label = QLabel(text) text_label = QLabel(text)
text_label.setStyleSheet("font-size: 25px; color: red;") text_label.setStyleSheet("font-size: 25px; color: red;")
self._ui_form.scrollAreaWidgetContents.layout().addWidget(text_label) self._ui_form.scrollAreaWidgetContents.layout().addWidget(text_label)
self._ui_form.scrollArea.verticalScrollBar().setValue(self._ui_form.scrollArea.verticalScrollBar().maximum()) self._ui_form.scrollArea.verticalScrollBar().setValue(
self._ui_form.scrollArea.verticalScrollBar().maximum()
)
def create_frequency_sweep_spinner_dialog(self) -> None: def create_frequency_sweep_spinner_dialog(self) -> None:
"""Creates a frequency sweep spinner dialog.""" """Creates a frequency sweep spinner dialog."""
@ -296,13 +317,19 @@ class AutoTMView(ModuleView):
# Create table widget # Create table widget
self.table_widget = QTableWidget() self.table_widget = QTableWidget()
self.table_widget.setColumnCount(3) self.table_widget.setColumnCount(3)
self.table_widget.setHorizontalHeaderLabels(["Frequency (MHz)", "Matching Voltage", "Tuning Voltage"]) self.table_widget.setHorizontalHeaderLabels(
["Frequency (MHz)", "Matching Voltage", "Tuning Voltage"]
)
LUT = self.module.model.LUT LUT = self.module.model.LUT
for row, frequency in enumerate(LUT.data.keys()): for row, frequency in enumerate(LUT.data.keys()):
self.table_widget.insertRow(row) self.table_widget.insertRow(row)
self.table_widget.setItem(row, 0, QTableWidgetItem(str(frequency))) self.table_widget.setItem(row, 0, QTableWidgetItem(str(frequency)))
self.table_widget.setItem(row, 1, QTableWidgetItem(str(LUT.data[frequency][0]))) self.table_widget.setItem(
self.table_widget.setItem(row, 2, QTableWidgetItem(str(LUT.data[frequency][1]))) row, 1, QTableWidgetItem(str(LUT.data[frequency][0]))
)
self.table_widget.setItem(
row, 2, QTableWidgetItem(str(LUT.data[frequency][1]))
)
# Add table widget to main layout # Add table widget to main layout
main_layout.addWidget(self.table_widget) main_layout.addWidget(self.table_widget)
@ -355,7 +382,9 @@ class AutoTMView(ModuleView):
short_layout = QVBoxLayout() short_layout = QVBoxLayout()
short_button = QPushButton("Short") short_button = QPushButton("Short")
short_button.clicked.connect( short_button.clicked.connect(
lambda: self.module.controller.on_short_calibration(start_edit.text(), stop_edit.text()) lambda: self.module.controller.on_short_calibration(
start_edit.text(), stop_edit.text()
)
) )
# Short plot widget # Short plot widget
self.short_plot = MplWidget() self.short_plot = MplWidget()
@ -367,7 +396,9 @@ class AutoTMView(ModuleView):
open_layout = QVBoxLayout() open_layout = QVBoxLayout()
open_button = QPushButton("Open") open_button = QPushButton("Open")
open_button.clicked.connect( open_button.clicked.connect(
lambda: self.module.controller.on_open_calibration(start_edit.text(), stop_edit.text()) lambda: self.module.controller.on_open_calibration(
start_edit.text(), stop_edit.text()
)
) )
# Open plot widget # Open plot widget
self.open_plot = MplWidget() self.open_plot = MplWidget()
@ -379,7 +410,9 @@ class AutoTMView(ModuleView):
load_layout = QVBoxLayout() load_layout = QVBoxLayout()
load_button = QPushButton("Load") load_button = QPushButton("Load")
load_button.clicked.connect( load_button.clicked.connect(
lambda: self.module.controller.on_load_calibration(start_edit.text(), stop_edit.text()) lambda: self.module.controller.on_load_calibration(
start_edit.text(), stop_edit.text()
)
) )
# Load plot widget # Load plot widget
self.load_plot = MplWidget() self.load_plot = MplWidget()
@ -407,9 +440,15 @@ class AutoTMView(ModuleView):
self.setLayout(main_layout) self.setLayout(main_layout)
# Connect the calibration finished signals to the on_calibration_finished slot # Connect the calibration finished signals to the on_calibration_finished slot
self.module.model.short_calibration_finished.connect(self.on_short_calibration_finished) self.module.model.short_calibration_finished.connect(
self.module.model.open_calibration_finished.connect(self.on_open_calibration_finished) self.on_short_calibration_finished
self.module.model.load_calibration_finished.connect(self.on_load_calibration_finished) )
self.module.model.open_calibration_finished.connect(
self.on_open_calibration_finished
)
self.module.model.load_calibration_finished.connect(
self.on_load_calibration_finished
)
def on_short_calibration_finished(self, short_calibration: "S11Data") -> None: def on_short_calibration_finished(self, short_calibration: "S11Data") -> None:
self.on_calibration_finished("short", self.short_plot, short_calibration) self.on_calibration_finished("short", self.short_plot, short_calibration)
@ -420,7 +459,9 @@ class AutoTMView(ModuleView):
def on_load_calibration_finished(self, load_calibration: "S11Data") -> None: def on_load_calibration_finished(self, load_calibration: "S11Data") -> None:
self.on_calibration_finished("load", self.load_plot, load_calibration) self.on_calibration_finished("load", self.load_plot, load_calibration)
def on_calibration_finished(self, type: str, widget: MplWidget, data: "S11Data") -> None: def on_calibration_finished(
self, type: str, widget: MplWidget, data: "S11Data"
) -> None:
"""This method is called when a calibration has finished. """This method is called when a calibration has finished.
It plots the calibration data on the given widget. It plots the calibration data on the given widget.
""" """