Changed UI for mech stepper LUT generation.

This commit is contained in:
jupfi 2023-12-07 13:09:07 +01:00
parent c993512c9b
commit a6521ad5b2
4 changed files with 392 additions and 294 deletions

View file

@ -139,6 +139,9 @@ class S11Data:
* phase_sign[i] * phase_sign[i]
) )
# Murks: The last point is always wrong so just set it to the previous value
phase_data_corrected[-1] = phase_data_corrected[-2]
return phase_data_corrected return phase_data_corrected
def to_json(self): def to_json(self):

View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1280</width> <width>1280</width>
<height>862</height> <height>1011</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -26,6 +26,7 @@
<widget class="QLabel" name="titleconnectionLabel"> <widget class="QLabel" name="titleconnectionLabel">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
@ -76,10 +77,58 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="tmsettingsLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>T&amp;M Settings:</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_8">
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="stopfrequencyBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Stop Frequency (MHz)</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="startfrequencyBox"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Start Frequency (MHz)</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Frequency Step (MHz)</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="frequencystepBox"/>
</item>
</layout>
</item>
<item> <item>
<widget class="QLabel" name="titletypeLabel"> <widget class="QLabel" name="titletypeLabel">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
@ -97,24 +146,65 @@
<attribute name="title"> <attribute name="title">
<string>Mechanical</string> <string>Mechanical</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0,0,0">
<item> <item>
<layout class="QGridLayout" name="gridLayout_4" rowstretch="0,0,0,0,0,0"> <layout class="QGridLayout" name="gridLayout_4" rowstretch="0,0,0,0,0,0">
<item row="5" column="1"> <item row="4" column="1">
<widget class="QPushButton" name="homematcherButton"> <widget class="QPushButton" name="homeButton">
<property name="text"> <property name="text">
<string>Home</string> <string>Home</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="0" colspan="3">
<widget class="QLabel" name="label_17"> <widget class="QLabel" name="label_16">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>Step Size:</string> <string>Stepper Control:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="stepperselectBox">
<item>
<property name="text">
<string>Tuning</string>
</property>
</item>
<item>
<property name="text">
<string>Matching</string>
</property>
</item>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="decreaseButton">
<property name="text">
<string>-</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="increaseButton">
<property name="text">
<string>+</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>Stepper:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="stepsizeBox"> <widget class="QSpinBox" name="stepsizeBox">
<property name="minimum"> <property name="minimum">
<number>-1000</number> <number>-1000</number>
@ -127,68 +217,50 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="2" column="0">
<widget class="QLabel" name="label_18"> <widget class="QLabel" name="label_17">
<property name="text"> <property name="text">
<string>Tuning Stepper:</string> <string>Step Size:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="decreasetunerButton">
<property name="text">
<string>-</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="increasetunerButton">
<property name="text">
<string>+</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QLabel" name="label_19">
<property name="text">
<string>Matching Stepper:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QPushButton" name="decreasematcherButton"> <widget class="QLabel" name="label_20">
<property name="text"> <property name="text">
<string>-</string> <string>Absolute:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="2"> <item row="5" column="2">
<widget class="QPushButton" name="increasematcherButton"> <widget class="QPushButton" name="absoluteGoButton">
<property name="text"> <property name="text">
<string>+</string> <string>Go</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="5" column="1">
<widget class="QPushButton" name="hometunerButton"> <widget class="QSpinBox" name="absoluteposBox"/>
<property name="text">
<string>Home</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Stepper Control:</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QPushButton" name="starpositionButton"> <widget class="QPushButton" name="positionButton">
<property name="text"> <property name="text">
<string>Start Position</string> <string>Saved Positions</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mechLUTButton">
<property name="text">
<string>Generate LUT</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="viewmechLUTButton">
<property name="text">
<string>View LUT</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -212,15 +284,8 @@
<string>Electrical</string> <string>Electrical</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0"> <layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0">
<item row="5" column="0"> <item row="2" column="1">
<widget class="QLabel" name="label_4"> <widget class="QDoubleSpinBox" name="matchingBox"/>
<property name="text">
<string>Voltage Resolution</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QDoubleSpinBox" name="stopfrequencyBox"/>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
@ -229,70 +294,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="tuningBox"/>
</item>
<item row="8" column="1">
<widget class="QDoubleSpinBox" name="frequencystepBox"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_11">
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Generate LUT:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QDoubleSpinBox" name="startfrequencyBox"/>
</item>
<item row="9" column="0" colspan="2">
<widget class="QPushButton" name="generateLUTButton">
<property name="text">
<string>Start Voltage Sweep</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Stop Frequency (MHz)</string>
</property>
</widget>
</item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QDoubleSpinBox" name="resolutionBox"/> <widget class="QDoubleSpinBox" name="resolutionBox"/>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Set Voltages:</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>RF Switch:</string>
</property>
</widget>
</item>
<item row="10" column="0" colspan="2">
<widget class="QPushButton" name="viewLUTButton">
<property name="text">
<string>View LUT</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QPushButton" name="setvoltagesButton"> <widget class="QPushButton" name="setvoltagesButton">
<property name="text"> <property name="text">
@ -300,6 +304,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Voltage Resolution</string>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
@ -307,34 +318,46 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="1" column="1">
<widget class="QLabel" name="label_12"> <widget class="QDoubleSpinBox" name="tuningBox"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>Start Frequency (MHz)</string> <string>Set Voltages:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="10" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="matchingBox"/> <widget class="QPushButton" name="viewelLUTButton">
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_14">
<property name="text"> <property name="text">
<string>Frequency Step (MHz)</string> <string>View LUT</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> <item row="9" column="0" colspan="2">
<widget class="QPushButton" name="switchpreampButton"> <widget class="QPushButton" name="generateLUTButton">
<property name="text"> <property name="text">
<string>Preamplifier</string> <string>Start Voltage Sweep</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1"> <item row="4" column="0">
<widget class="QPushButton" name="switchATMButton"> <widget class="QLabel" name="label_11">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>ATM</string> <string>Generate LUT:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -342,10 +365,42 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="rfswitchLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>RF Switch:</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<widget class="QPushButton" name="switchATMButton">
<property name="text">
<string>ATM</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="switchpreampButton">
<property name="text">
<string>Preamplifier</string>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<widget class="QLabel" name="titlefrequencyLabel"> <widget class="QLabel" name="titlefrequencyLabel">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
@ -363,17 +418,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>MHz</string> <string>Stop Frequency:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="stopEdit">
<property name="text">
<string>100</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -384,13 +432,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Stop Frequency:</string>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
@ -398,6 +439,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QLineEdit" name="stopEdit">
<property name="text">
<string>100</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_8">
<property name="text">
<string>MHz</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -425,6 +480,7 @@
<widget class="QLabel" name="titleinfoLabel"> <widget class="QLabel" name="titleinfoLabel">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
@ -443,8 +499,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>297</width> <width>285</width>
<height>68</height> <height>83</height>
</rect> </rect>
</property> </property>
</widget> </widget>

View file

@ -72,7 +72,7 @@ class AutoTMView(ModuleView):
) )
# On clicking of the viewLUTButton call the view_lut method # On clicking of the viewLUTButton call the view_lut method
self._ui_form.viewLUTButton.clicked.connect(self.view_lut) self._ui_form.viewelLUTButton.clicked.connect(self.view_el_lut)
# On clicking of the setvoltagesButton call the set_voltages method # On clicking of the setvoltagesButton call the set_voltages method
self._ui_form.setvoltagesButton.clicked.connect( self._ui_form.setvoltagesButton.clicked.connect(
@ -97,7 +97,7 @@ class AutoTMView(ModuleView):
) )
# On clicking of the homingButton call the homing method # On clicking of the homingButton call the homing method
self._ui_form.starpositionButton.clicked.connect(self.module.controller.homing) self._ui_form.homeButton.clicked.connect(self.module.controller.homing)
# Connect the measurement finished signal to the plot_measurement slot # Connect the measurement finished signal to the plot_measurement slot
self.module.model.measurement_finished.connect(self.plot_measurement) self.module.model.measurement_finished.connect(self.plot_measurement)
@ -117,6 +117,7 @@ class AutoTMView(ModuleView):
def init_labels(self) -> None: def init_labels(self) -> None:
"""Makes some of the labels bold for better readability.""" """Makes some of the labels bold for better readability."""
self._ui_form.tmsettingsLabel.setStyleSheet("font-weight: bold;")
self._ui_form.titleconnectionLabel.setStyleSheet("font-weight: bold;") self._ui_form.titleconnectionLabel.setStyleSheet("font-weight: bold;")
self._ui_form.titlefrequencyLabel.setStyleSheet("font-weight: bold;") self._ui_form.titlefrequencyLabel.setStyleSheet("font-weight: bold;")
self._ui_form.titletypeLabel.setStyleSheet("font-weight: bold;") self._ui_form.titletypeLabel.setStyleSheet("font-weight: bold;")
@ -291,8 +292,8 @@ class AutoTMView(ModuleView):
self.frequency_sweep_spinner = self.FrequencySweepSpinner(self) self.frequency_sweep_spinner = self.FrequencySweepSpinner(self)
self.frequency_sweep_spinner.show() self.frequency_sweep_spinner.show()
def view_lut(self) -> None: def view_el_lut(self) -> None:
"""Creates a new Dialog that shows the currently active LUT.""" """Creates a new Dialog that shows the currently active electrical LUT."""
logger.debug("View LUT") logger.debug("View LUT")
self.lut_window = self.LutWindow(self.module) self.lut_window = self.LutWindow(self.module)
self.lut_window.show() self.lut_window.show()

View file

@ -1,6 +1,6 @@
# Form implementation generated from reading ui file '../Modules/nqrduck-autotm/src/nqrduck_autotm/resources/autotm_widget.ui' # Form implementation generated from reading ui file '../Modules/nqrduck-autotm/src/nqrduck_autotm/resources/autotm_widget.ui'
# #
# Created by: PyQt6 UI code generator 6.4.2 # Created by: PyQt6 UI code generator 6.5.1
# #
# WARNING: Any manual changes made to this file will be lost when pyuic6 is # WARNING: Any manual changes made to this file will be lost when pyuic6 is
# run again. Do not edit this file unless you know what you are doing. # run again. Do not edit this file unless you know what you are doing.
@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
class Ui_Form(object): class Ui_Form(object):
def setupUi(self, Form): def setupUi(self, Form):
Form.setObjectName("Form") Form.setObjectName("Form")
Form.resize(1280, 862) Form.resize(1280, 1011)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
@ -25,6 +25,7 @@ class Ui_Form(object):
self.titleconnectionLabel = QtWidgets.QLabel(parent=Form) self.titleconnectionLabel = QtWidgets.QLabel(parent=Form)
font = QtGui.QFont() font = QtGui.QFont()
font.setBold(True) font.setBold(True)
font.setWeight(75)
self.titleconnectionLabel.setFont(font) self.titleconnectionLabel.setFont(font)
self.titleconnectionLabel.setObjectName("titleconnectionLabel") self.titleconnectionLabel.setObjectName("titleconnectionLabel")
self.verticalLayout_2.addWidget(self.titleconnectionLabel) self.verticalLayout_2.addWidget(self.titleconnectionLabel)
@ -50,9 +51,38 @@ class Ui_Form(object):
self.connectButton = QtWidgets.QPushButton(parent=Form) self.connectButton = QtWidgets.QPushButton(parent=Form)
self.connectButton.setObjectName("connectButton") self.connectButton.setObjectName("connectButton")
self.verticalLayout_2.addWidget(self.connectButton) self.verticalLayout_2.addWidget(self.connectButton)
self.tmsettingsLabel = QtWidgets.QLabel(parent=Form)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.tmsettingsLabel.setFont(font)
self.tmsettingsLabel.setObjectName("tmsettingsLabel")
self.verticalLayout_2.addWidget(self.tmsettingsLabel)
self.gridLayout_8 = QtWidgets.QGridLayout()
self.gridLayout_8.setObjectName("gridLayout_8")
self.stopfrequencyBox = QtWidgets.QDoubleSpinBox(parent=Form)
self.stopfrequencyBox.setObjectName("stopfrequencyBox")
self.gridLayout_8.addWidget(self.stopfrequencyBox, 1, 1, 1, 1)
self.label_13 = QtWidgets.QLabel(parent=Form)
self.label_13.setObjectName("label_13")
self.gridLayout_8.addWidget(self.label_13, 1, 0, 1, 1)
self.startfrequencyBox = QtWidgets.QDoubleSpinBox(parent=Form)
self.startfrequencyBox.setObjectName("startfrequencyBox")
self.gridLayout_8.addWidget(self.startfrequencyBox, 0, 1, 1, 1)
self.label_12 = QtWidgets.QLabel(parent=Form)
self.label_12.setObjectName("label_12")
self.gridLayout_8.addWidget(self.label_12, 0, 0, 1, 1)
self.label_14 = QtWidgets.QLabel(parent=Form)
self.label_14.setObjectName("label_14")
self.gridLayout_8.addWidget(self.label_14, 2, 0, 1, 1)
self.frequencystepBox = QtWidgets.QDoubleSpinBox(parent=Form)
self.frequencystepBox.setObjectName("frequencystepBox")
self.gridLayout_8.addWidget(self.frequencystepBox, 2, 1, 1, 1)
self.verticalLayout_2.addLayout(self.gridLayout_8)
self.titletypeLabel = QtWidgets.QLabel(parent=Form) self.titletypeLabel = QtWidgets.QLabel(parent=Form)
font = QtGui.QFont() font = QtGui.QFont()
font.setBold(True) font.setBold(True)
font.setWeight(75)
self.titletypeLabel.setFont(font) self.titletypeLabel.setFont(font)
self.titletypeLabel.setObjectName("titletypeLabel") self.titletypeLabel.setObjectName("titletypeLabel")
self.verticalLayout_2.addWidget(self.titletypeLabel) self.verticalLayout_2.addWidget(self.titletypeLabel)
@ -64,46 +94,58 @@ class Ui_Form(object):
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName("verticalLayout")
self.gridLayout_4 = QtWidgets.QGridLayout() self.gridLayout_4 = QtWidgets.QGridLayout()
self.gridLayout_4.setObjectName("gridLayout_4") self.gridLayout_4.setObjectName("gridLayout_4")
self.homematcherButton = QtWidgets.QPushButton(parent=self.mechTab) self.homeButton = QtWidgets.QPushButton(parent=self.mechTab)
self.homematcherButton.setObjectName("homematcherButton") self.homeButton.setObjectName("homeButton")
self.gridLayout_4.addWidget(self.homematcherButton, 5, 1, 1, 1) self.gridLayout_4.addWidget(self.homeButton, 4, 1, 1, 1)
self.label_17 = QtWidgets.QLabel(parent=self.mechTab) self.label_16 = QtWidgets.QLabel(parent=self.mechTab)
self.label_17.setObjectName("label_17") font = QtGui.QFont()
self.gridLayout_4.addWidget(self.label_17, 1, 0, 1, 1) font.setBold(True)
font.setWeight(75)
self.label_16.setFont(font)
self.label_16.setObjectName("label_16")
self.gridLayout_4.addWidget(self.label_16, 0, 0, 1, 3)
self.stepperselectBox = QtWidgets.QComboBox(parent=self.mechTab)
self.stepperselectBox.setObjectName("stepperselectBox")
self.stepperselectBox.addItem("")
self.stepperselectBox.addItem("")
self.gridLayout_4.addWidget(self.stepperselectBox, 1, 1, 1, 1)
self.decreaseButton = QtWidgets.QPushButton(parent=self.mechTab)
self.decreaseButton.setObjectName("decreaseButton")
self.gridLayout_4.addWidget(self.decreaseButton, 4, 0, 1, 1)
self.increaseButton = QtWidgets.QPushButton(parent=self.mechTab)
self.increaseButton.setObjectName("increaseButton")
self.gridLayout_4.addWidget(self.increaseButton, 4, 2, 1, 1)
self.label_18 = QtWidgets.QLabel(parent=self.mechTab)
self.label_18.setObjectName("label_18")
self.gridLayout_4.addWidget(self.label_18, 1, 0, 1, 1)
self.stepsizeBox = QtWidgets.QSpinBox(parent=self.mechTab) self.stepsizeBox = QtWidgets.QSpinBox(parent=self.mechTab)
self.stepsizeBox.setMinimum(-1000) self.stepsizeBox.setMinimum(-1000)
self.stepsizeBox.setMaximum(1000) self.stepsizeBox.setMaximum(1000)
self.stepsizeBox.setProperty("value", 500) self.stepsizeBox.setProperty("value", 500)
self.stepsizeBox.setObjectName("stepsizeBox") self.stepsizeBox.setObjectName("stepsizeBox")
self.gridLayout_4.addWidget(self.stepsizeBox, 1, 1, 1, 1) self.gridLayout_4.addWidget(self.stepsizeBox, 2, 1, 1, 1)
self.label_18 = QtWidgets.QLabel(parent=self.mechTab) self.label_17 = QtWidgets.QLabel(parent=self.mechTab)
self.label_18.setObjectName("label_18") self.label_17.setObjectName("label_17")
self.gridLayout_4.addWidget(self.label_18, 2, 0, 1, 3) self.gridLayout_4.addWidget(self.label_17, 2, 0, 1, 1)
self.decreasetunerButton = QtWidgets.QPushButton(parent=self.mechTab) self.label_20 = QtWidgets.QLabel(parent=self.mechTab)
self.decreasetunerButton.setObjectName("decreasetunerButton") self.label_20.setObjectName("label_20")
self.gridLayout_4.addWidget(self.decreasetunerButton, 3, 0, 1, 1) self.gridLayout_4.addWidget(self.label_20, 5, 0, 1, 1)
self.increasetunerButton = QtWidgets.QPushButton(parent=self.mechTab) self.absoluteGoButton = QtWidgets.QPushButton(parent=self.mechTab)
self.increasetunerButton.setObjectName("increasetunerButton") self.absoluteGoButton.setObjectName("absoluteGoButton")
self.gridLayout_4.addWidget(self.increasetunerButton, 3, 2, 1, 1) self.gridLayout_4.addWidget(self.absoluteGoButton, 5, 2, 1, 1)
self.label_19 = QtWidgets.QLabel(parent=self.mechTab) self.absoluteposBox = QtWidgets.QSpinBox(parent=self.mechTab)
self.label_19.setObjectName("label_19") self.absoluteposBox.setObjectName("absoluteposBox")
self.gridLayout_4.addWidget(self.label_19, 4, 0, 1, 3) self.gridLayout_4.addWidget(self.absoluteposBox, 5, 1, 1, 1)
self.decreasematcherButton = QtWidgets.QPushButton(parent=self.mechTab)
self.decreasematcherButton.setObjectName("decreasematcherButton")
self.gridLayout_4.addWidget(self.decreasematcherButton, 5, 0, 1, 1)
self.increasematcherButton = QtWidgets.QPushButton(parent=self.mechTab)
self.increasematcherButton.setObjectName("increasematcherButton")
self.gridLayout_4.addWidget(self.increasematcherButton, 5, 2, 1, 1)
self.hometunerButton = QtWidgets.QPushButton(parent=self.mechTab)
self.hometunerButton.setObjectName("hometunerButton")
self.gridLayout_4.addWidget(self.hometunerButton, 3, 1, 1, 1)
self.label_16 = QtWidgets.QLabel(parent=self.mechTab)
self.label_16.setObjectName("label_16")
self.gridLayout_4.addWidget(self.label_16, 0, 0, 1, 3)
self.verticalLayout.addLayout(self.gridLayout_4) self.verticalLayout.addLayout(self.gridLayout_4)
self.starpositionButton = QtWidgets.QPushButton(parent=self.mechTab) self.positionButton = QtWidgets.QPushButton(parent=self.mechTab)
self.starpositionButton.setObjectName("starpositionButton") self.positionButton.setObjectName("positionButton")
self.verticalLayout.addWidget(self.starpositionButton) self.verticalLayout.addWidget(self.positionButton)
self.mechLUTButton = QtWidgets.QPushButton(parent=self.mechTab)
self.mechLUTButton.setObjectName("mechLUTButton")
self.verticalLayout.addWidget(self.mechLUTButton)
self.viewmechLUTButton = QtWidgets.QPushButton(parent=self.mechTab)
self.viewmechLUTButton.setObjectName("viewmechLUTButton")
self.verticalLayout.addWidget(self.viewmechLUTButton)
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
self.verticalLayout.addItem(spacerItem) self.verticalLayout.addItem(spacerItem)
self.verticalLayout.setStretch(1, 1) self.verticalLayout.setStretch(1, 1)
@ -112,77 +154,69 @@ class Ui_Form(object):
self.elecTab.setObjectName("elecTab") self.elecTab.setObjectName("elecTab")
self.gridLayout_3 = QtWidgets.QGridLayout(self.elecTab) self.gridLayout_3 = QtWidgets.QGridLayout(self.elecTab)
self.gridLayout_3.setObjectName("gridLayout_3") self.gridLayout_3.setObjectName("gridLayout_3")
self.label_4 = QtWidgets.QLabel(parent=self.elecTab)
self.label_4.setObjectName("label_4")
self.gridLayout_3.addWidget(self.label_4, 5, 0, 1, 1)
self.stopfrequencyBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab)
self.stopfrequencyBox.setObjectName("stopfrequencyBox")
self.gridLayout_3.addWidget(self.stopfrequencyBox, 7, 1, 1, 1)
self.label_2 = QtWidgets.QLabel(parent=self.elecTab)
self.label_2.setObjectName("label_2")
self.gridLayout_3.addWidget(self.label_2, 1, 0, 1, 1)
self.tuningBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab)
self.tuningBox.setObjectName("tuningBox")
self.gridLayout_3.addWidget(self.tuningBox, 1, 1, 1, 1)
self.frequencystepBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab)
self.frequencystepBox.setObjectName("frequencystepBox")
self.gridLayout_3.addWidget(self.frequencystepBox, 8, 1, 1, 1)
self.label_11 = QtWidgets.QLabel(parent=self.elecTab)
font = QtGui.QFont()
font.setBold(True)
self.label_11.setFont(font)
self.label_11.setObjectName("label_11")
self.gridLayout_3.addWidget(self.label_11, 4, 0, 1, 1)
self.startfrequencyBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab)
self.startfrequencyBox.setObjectName("startfrequencyBox")
self.gridLayout_3.addWidget(self.startfrequencyBox, 6, 1, 1, 1)
self.generateLUTButton = QtWidgets.QPushButton(parent=self.elecTab)
self.generateLUTButton.setObjectName("generateLUTButton")
self.gridLayout_3.addWidget(self.generateLUTButton, 9, 0, 1, 2)
self.label_13 = QtWidgets.QLabel(parent=self.elecTab)
self.label_13.setObjectName("label_13")
self.gridLayout_3.addWidget(self.label_13, 7, 0, 1, 1)
self.resolutionBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab)
self.resolutionBox.setObjectName("resolutionBox")
self.gridLayout_3.addWidget(self.resolutionBox, 5, 1, 1, 1)
self.label_9 = QtWidgets.QLabel(parent=self.elecTab)
font = QtGui.QFont()
font.setBold(True)
self.label_9.setFont(font)
self.label_9.setObjectName("label_9")
self.gridLayout_3.addWidget(self.label_9, 0, 0, 1, 1)
self.label_15 = QtWidgets.QLabel(parent=self.elecTab)
self.label_15.setObjectName("label_15")
self.gridLayout_3.addWidget(self.label_15, 11, 0, 1, 1)
self.viewLUTButton = QtWidgets.QPushButton(parent=self.elecTab)
self.viewLUTButton.setObjectName("viewLUTButton")
self.gridLayout_3.addWidget(self.viewLUTButton, 10, 0, 1, 2)
self.setvoltagesButton = QtWidgets.QPushButton(parent=self.elecTab)
self.setvoltagesButton.setObjectName("setvoltagesButton")
self.gridLayout_3.addWidget(self.setvoltagesButton, 3, 0, 1, 2)
self.label_3 = QtWidgets.QLabel(parent=self.elecTab)
self.label_3.setObjectName("label_3")
self.gridLayout_3.addWidget(self.label_3, 2, 0, 1, 1)
self.label_12 = QtWidgets.QLabel(parent=self.elecTab)
self.label_12.setObjectName("label_12")
self.gridLayout_3.addWidget(self.label_12, 6, 0, 1, 1)
self.matchingBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab) self.matchingBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab)
self.matchingBox.setObjectName("matchingBox") self.matchingBox.setObjectName("matchingBox")
self.gridLayout_3.addWidget(self.matchingBox, 2, 1, 1, 1) self.gridLayout_3.addWidget(self.matchingBox, 2, 1, 1, 1)
self.label_14 = QtWidgets.QLabel(parent=self.elecTab) self.label_2 = QtWidgets.QLabel(parent=self.elecTab)
self.label_14.setObjectName("label_14") self.label_2.setObjectName("label_2")
self.gridLayout_3.addWidget(self.label_14, 8, 0, 1, 1) self.gridLayout_3.addWidget(self.label_2, 1, 0, 1, 1)
self.switchpreampButton = QtWidgets.QPushButton(parent=self.elecTab) self.resolutionBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab)
self.switchpreampButton.setObjectName("switchpreampButton") self.resolutionBox.setObjectName("resolutionBox")
self.gridLayout_3.addWidget(self.switchpreampButton, 12, 0, 1, 1) self.gridLayout_3.addWidget(self.resolutionBox, 5, 1, 1, 1)
self.switchATMButton = QtWidgets.QPushButton(parent=self.elecTab) self.setvoltagesButton = QtWidgets.QPushButton(parent=self.elecTab)
self.switchATMButton.setObjectName("switchATMButton") self.setvoltagesButton.setObjectName("setvoltagesButton")
self.gridLayout_3.addWidget(self.switchATMButton, 12, 1, 1, 1) self.gridLayout_3.addWidget(self.setvoltagesButton, 3, 0, 1, 2)
self.label_4 = QtWidgets.QLabel(parent=self.elecTab)
self.label_4.setObjectName("label_4")
self.gridLayout_3.addWidget(self.label_4, 5, 0, 1, 1)
self.label_3 = QtWidgets.QLabel(parent=self.elecTab)
self.label_3.setObjectName("label_3")
self.gridLayout_3.addWidget(self.label_3, 2, 0, 1, 1)
self.tuningBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab)
self.tuningBox.setObjectName("tuningBox")
self.gridLayout_3.addWidget(self.tuningBox, 1, 1, 1, 1)
self.label_9 = QtWidgets.QLabel(parent=self.elecTab)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.label_9.setFont(font)
self.label_9.setObjectName("label_9")
self.gridLayout_3.addWidget(self.label_9, 0, 0, 1, 1)
self.viewelLUTButton = QtWidgets.QPushButton(parent=self.elecTab)
self.viewelLUTButton.setObjectName("viewelLUTButton")
self.gridLayout_3.addWidget(self.viewelLUTButton, 10, 0, 1, 2)
self.generateLUTButton = QtWidgets.QPushButton(parent=self.elecTab)
self.generateLUTButton.setObjectName("generateLUTButton")
self.gridLayout_3.addWidget(self.generateLUTButton, 9, 0, 1, 2)
self.label_11 = QtWidgets.QLabel(parent=self.elecTab)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.label_11.setFont(font)
self.label_11.setObjectName("label_11")
self.gridLayout_3.addWidget(self.label_11, 4, 0, 1, 1)
self.typeTab.addTab(self.elecTab, "") self.typeTab.addTab(self.elecTab, "")
self.verticalLayout_2.addWidget(self.typeTab) self.verticalLayout_2.addWidget(self.typeTab)
self.rfswitchLabel = QtWidgets.QLabel(parent=Form)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.rfswitchLabel.setFont(font)
self.rfswitchLabel.setObjectName("rfswitchLabel")
self.verticalLayout_2.addWidget(self.rfswitchLabel)
self.gridLayout_7 = QtWidgets.QGridLayout()
self.gridLayout_7.setObjectName("gridLayout_7")
self.switchATMButton = QtWidgets.QPushButton(parent=Form)
self.switchATMButton.setObjectName("switchATMButton")
self.gridLayout_7.addWidget(self.switchATMButton, 0, 0, 1, 1)
self.switchpreampButton = QtWidgets.QPushButton(parent=Form)
self.switchpreampButton.setObjectName("switchpreampButton")
self.gridLayout_7.addWidget(self.switchpreampButton, 0, 1, 1, 1)
self.verticalLayout_2.addLayout(self.gridLayout_7)
self.titlefrequencyLabel = QtWidgets.QLabel(parent=Form) self.titlefrequencyLabel = QtWidgets.QLabel(parent=Form)
font = QtGui.QFont() font = QtGui.QFont()
font.setBold(True) font.setBold(True)
font.setWeight(75)
self.titlefrequencyLabel.setFont(font) self.titlefrequencyLabel.setFont(font)
self.titlefrequencyLabel.setObjectName("titlefrequencyLabel") self.titlefrequencyLabel.setObjectName("titlefrequencyLabel")
self.verticalLayout_2.addWidget(self.titlefrequencyLabel) self.verticalLayout_2.addWidget(self.titlefrequencyLabel)
@ -191,21 +225,21 @@ class Ui_Form(object):
self.startEdit = QtWidgets.QLineEdit(parent=Form) self.startEdit = QtWidgets.QLineEdit(parent=Form)
self.startEdit.setObjectName("startEdit") self.startEdit.setObjectName("startEdit")
self.gridLayout.addWidget(self.startEdit, 0, 1, 1, 1) self.gridLayout.addWidget(self.startEdit, 0, 1, 1, 1)
self.label_8 = QtWidgets.QLabel(parent=Form)
self.label_8.setObjectName("label_8")
self.gridLayout.addWidget(self.label_8, 1, 2, 1, 1)
self.stopEdit = QtWidgets.QLineEdit(parent=Form)
self.stopEdit.setObjectName("stopEdit")
self.gridLayout.addWidget(self.stopEdit, 1, 1, 1, 1)
self.label_6 = QtWidgets.QLabel(parent=Form)
self.label_6.setObjectName("label_6")
self.gridLayout.addWidget(self.label_6, 0, 2, 1, 1)
self.label_7 = QtWidgets.QLabel(parent=Form) self.label_7 = QtWidgets.QLabel(parent=Form)
self.label_7.setObjectName("label_7") self.label_7.setObjectName("label_7")
self.gridLayout.addWidget(self.label_7, 1, 0, 1, 1) self.gridLayout.addWidget(self.label_7, 1, 0, 1, 1)
self.label_6 = QtWidgets.QLabel(parent=Form)
self.label_6.setObjectName("label_6")
self.gridLayout.addWidget(self.label_6, 0, 2, 1, 1)
self.label_5 = QtWidgets.QLabel(parent=Form) self.label_5 = QtWidgets.QLabel(parent=Form)
self.label_5.setObjectName("label_5") self.label_5.setObjectName("label_5")
self.gridLayout.addWidget(self.label_5, 0, 0, 1, 1) self.gridLayout.addWidget(self.label_5, 0, 0, 1, 1)
self.stopEdit = QtWidgets.QLineEdit(parent=Form)
self.stopEdit.setObjectName("stopEdit")
self.gridLayout.addWidget(self.stopEdit, 1, 1, 1, 1)
self.label_8 = QtWidgets.QLabel(parent=Form)
self.label_8.setObjectName("label_8")
self.gridLayout.addWidget(self.label_8, 1, 2, 1, 1)
self.verticalLayout_2.addLayout(self.gridLayout) self.verticalLayout_2.addLayout(self.gridLayout)
self.startButton = QtWidgets.QPushButton(parent=Form) self.startButton = QtWidgets.QPushButton(parent=Form)
self.startButton.setObjectName("startButton") self.startButton.setObjectName("startButton")
@ -219,6 +253,7 @@ class Ui_Form(object):
self.titleinfoLabel = QtWidgets.QLabel(parent=Form) self.titleinfoLabel = QtWidgets.QLabel(parent=Form)
font = QtGui.QFont() font = QtGui.QFont()
font.setBold(True) font.setBold(True)
font.setWeight(75)
self.titleinfoLabel.setFont(font) self.titleinfoLabel.setFont(font)
self.titleinfoLabel.setObjectName("titleinfoLabel") self.titleinfoLabel.setObjectName("titleinfoLabel")
self.verticalLayout_2.addWidget(self.titleinfoLabel) self.verticalLayout_2.addWidget(self.titleinfoLabel)
@ -226,7 +261,7 @@ class Ui_Form(object):
self.scrollArea.setWidgetResizable(True) self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea") self.scrollArea.setObjectName("scrollArea")
self.scrollAreaWidgetContents = QtWidgets.QWidget() self.scrollAreaWidgetContents = QtWidgets.QWidget()
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 297, 68)) self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 285, 83))
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents") self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
self.scrollArea.setWidget(self.scrollAreaWidgetContents) self.scrollArea.setWidget(self.scrollAreaWidgetContents)
self.verticalLayout_2.addWidget(self.scrollArea) self.verticalLayout_2.addWidget(self.scrollArea)
@ -256,41 +291,44 @@ class Ui_Form(object):
self.label.setText(_translate("Form", "Port:")) self.label.setText(_translate("Form", "Port:"))
self.label_10.setText(_translate("Form", "Connected to:")) self.label_10.setText(_translate("Form", "Connected to:"))
self.connectButton.setText(_translate("Form", "Connect")) self.connectButton.setText(_translate("Form", "Connect"))
self.titletypeLabel.setText(_translate("Form", "T&M Type:")) self.tmsettingsLabel.setText(_translate("Form", "T&M Settings:"))
self.homematcherButton.setText(_translate("Form", "Home"))
self.label_17.setText(_translate("Form", "Step Size:"))
self.label_18.setText(_translate("Form", "Tuning Stepper:"))
self.decreasetunerButton.setText(_translate("Form", "-"))
self.increasetunerButton.setText(_translate("Form", "+"))
self.label_19.setText(_translate("Form", "Matching Stepper:"))
self.decreasematcherButton.setText(_translate("Form", "-"))
self.increasematcherButton.setText(_translate("Form", "+"))
self.hometunerButton.setText(_translate("Form", "Home"))
self.label_16.setText(_translate("Form", "Stepper Control:"))
self.starpositionButton.setText(_translate("Form", "Start Position"))
self.typeTab.setTabText(self.typeTab.indexOf(self.mechTab), _translate("Form", "Mechanical"))
self.label_4.setText(_translate("Form", "Voltage Resolution"))
self.label_2.setText(_translate("Form", "Voltage Tuning"))
self.label_11.setText(_translate("Form", "Generate LUT:"))
self.generateLUTButton.setText(_translate("Form", "Start Voltage Sweep"))
self.label_13.setText(_translate("Form", "Stop Frequency (MHz)")) self.label_13.setText(_translate("Form", "Stop Frequency (MHz)"))
self.label_9.setText(_translate("Form", "Set Voltages:"))
self.label_15.setText(_translate("Form", "RF Switch:"))
self.viewLUTButton.setText(_translate("Form", "View LUT"))
self.setvoltagesButton.setText(_translate("Form", "Set Voltages"))
self.label_3.setText(_translate("Form", "Voltage Matching"))
self.label_12.setText(_translate("Form", "Start Frequency (MHz)")) self.label_12.setText(_translate("Form", "Start Frequency (MHz)"))
self.label_14.setText(_translate("Form", "Frequency Step (MHz)")) self.label_14.setText(_translate("Form", "Frequency Step (MHz)"))
self.switchpreampButton.setText(_translate("Form", "Preamplifier")) self.titletypeLabel.setText(_translate("Form", "T&M Type:"))
self.switchATMButton.setText(_translate("Form", "ATM")) self.homeButton.setText(_translate("Form", "Home"))
self.label_16.setText(_translate("Form", "Stepper Control:"))
self.stepperselectBox.setItemText(0, _translate("Form", "Tuning"))
self.stepperselectBox.setItemText(1, _translate("Form", "Matching"))
self.decreaseButton.setText(_translate("Form", "-"))
self.increaseButton.setText(_translate("Form", "+"))
self.label_18.setText(_translate("Form", "Stepper:"))
self.label_17.setText(_translate("Form", "Step Size:"))
self.label_20.setText(_translate("Form", "Absolute:"))
self.absoluteGoButton.setText(_translate("Form", "Go"))
self.positionButton.setText(_translate("Form", "Saved Positions"))
self.mechLUTButton.setText(_translate("Form", "Generate LUT"))
self.viewmechLUTButton.setText(_translate("Form", "View LUT"))
self.typeTab.setTabText(self.typeTab.indexOf(self.mechTab), _translate("Form", "Mechanical"))
self.label_2.setText(_translate("Form", "Voltage Tuning"))
self.setvoltagesButton.setText(_translate("Form", "Set Voltages"))
self.label_4.setText(_translate("Form", "Voltage Resolution"))
self.label_3.setText(_translate("Form", "Voltage Matching"))
self.label_9.setText(_translate("Form", "Set Voltages:"))
self.viewelLUTButton.setText(_translate("Form", "View LUT"))
self.generateLUTButton.setText(_translate("Form", "Start Voltage Sweep"))
self.label_11.setText(_translate("Form", "Generate LUT:"))
self.typeTab.setTabText(self.typeTab.indexOf(self.elecTab), _translate("Form", "Electrical")) self.typeTab.setTabText(self.typeTab.indexOf(self.elecTab), _translate("Form", "Electrical"))
self.rfswitchLabel.setText(_translate("Form", "RF Switch:"))
self.switchATMButton.setText(_translate("Form", "ATM"))
self.switchpreampButton.setText(_translate("Form", "Preamplifier"))
self.titlefrequencyLabel.setText(_translate("Form", "Frequency Sweep:")) self.titlefrequencyLabel.setText(_translate("Form", "Frequency Sweep:"))
self.startEdit.setText(_translate("Form", "80")) self.startEdit.setText(_translate("Form", "80"))
self.label_8.setText(_translate("Form", "MHz"))
self.stopEdit.setText(_translate("Form", "100"))
self.label_6.setText(_translate("Form", "MHz"))
self.label_7.setText(_translate("Form", "Stop Frequency:")) self.label_7.setText(_translate("Form", "Stop Frequency:"))
self.label_6.setText(_translate("Form", "MHz"))
self.label_5.setText(_translate("Form", "Start Frequency:")) self.label_5.setText(_translate("Form", "Start Frequency:"))
self.stopEdit.setText(_translate("Form", "100"))
self.label_8.setText(_translate("Form", "MHz"))
self.startButton.setText(_translate("Form", "Start Sweep")) self.startButton.setText(_translate("Form", "Start Sweep"))
self.calibrationButton.setText(_translate("Form", "Calibrate")) self.calibrationButton.setText(_translate("Form", "Calibrate"))
self.pushButton_3.setText(_translate("Form", "T&M Settings")) self.pushButton_3.setText(_translate("Form", "T&M Settings"))