Updated widget.

This commit is contained in:
jupfi 2023-08-21 11:40:43 +02:00
parent 8579151bc2
commit b0ddbae9c5
3 changed files with 172 additions and 10 deletions

View file

@ -97,14 +97,114 @@
<attribute name="title"> <attribute name="title">
<string>Mechanical</string> <string>Mechanical</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
<item> <item>
<widget class="QPushButton" name="homingButton"> <layout class="QGridLayout" name="gridLayout_4" rowstretch="0,0,0,0,0,0">
<item row="5" column="1">
<widget class="QPushButton" name="homematcherButton">
<property name="text"> <property name="text">
<string>Homing</string> <string>Home</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Step Size:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="stepsizeBox">
<property name="minimum">
<number>-1000</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="value">
<number>500</number>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QLabel" name="label_18">
<property name="text">
<string>Tuning Stepper:</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>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="decreasematcherButton">
<property name="text">
<string>-</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QPushButton" name="increasematcherButton">
<property name="text">
<string>+</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="hometunerButton">
<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>
</layout>
</item>
<item>
<widget class="QPushButton" name="starpositionButton">
<property name="text">
<string>Start Position</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="elecTab"> <widget class="QWidget" name="elecTab">
@ -257,7 +357,11 @@
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="startEdit"/> <widget class="QLineEdit" name="startEdit">
<property name="text">
<string>80</string>
</property>
</widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
@ -267,7 +371,11 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="stopEdit"/> <widget class="QLineEdit" name="stopEdit">
<property name="text">
<string>100</string>
</property>
</widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">

View file

@ -100,7 +100,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.homingButton.clicked.connect(self.module.controller.homing) self._ui_form.starpositionButton.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)

View file

@ -62,9 +62,51 @@ class Ui_Form(object):
self.mechTab.setObjectName("mechTab") self.mechTab.setObjectName("mechTab")
self.verticalLayout = QtWidgets.QVBoxLayout(self.mechTab) self.verticalLayout = QtWidgets.QVBoxLayout(self.mechTab)
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName("verticalLayout")
self.homingButton = QtWidgets.QPushButton(parent=self.mechTab) self.gridLayout_4 = QtWidgets.QGridLayout()
self.homingButton.setObjectName("homingButton") self.gridLayout_4.setObjectName("gridLayout_4")
self.verticalLayout.addWidget(self.homingButton) self.homematcherButton = QtWidgets.QPushButton(parent=self.mechTab)
self.homematcherButton.setObjectName("homematcherButton")
self.gridLayout_4.addWidget(self.homematcherButton, 5, 1, 1, 1)
self.label_17 = QtWidgets.QLabel(parent=self.mechTab)
self.label_17.setObjectName("label_17")
self.gridLayout_4.addWidget(self.label_17, 1, 0, 1, 1)
self.stepsizeBox = QtWidgets.QSpinBox(parent=self.mechTab)
self.stepsizeBox.setMinimum(-1000)
self.stepsizeBox.setMaximum(1000)
self.stepsizeBox.setProperty("value", 500)
self.stepsizeBox.setObjectName("stepsizeBox")
self.gridLayout_4.addWidget(self.stepsizeBox, 1, 1, 1, 1)
self.label_18 = QtWidgets.QLabel(parent=self.mechTab)
self.label_18.setObjectName("label_18")
self.gridLayout_4.addWidget(self.label_18, 2, 0, 1, 3)
self.decreasetunerButton = QtWidgets.QPushButton(parent=self.mechTab)
self.decreasetunerButton.setObjectName("decreasetunerButton")
self.gridLayout_4.addWidget(self.decreasetunerButton, 3, 0, 1, 1)
self.increasetunerButton = QtWidgets.QPushButton(parent=self.mechTab)
self.increasetunerButton.setObjectName("increasetunerButton")
self.gridLayout_4.addWidget(self.increasetunerButton, 3, 2, 1, 1)
self.label_19 = QtWidgets.QLabel(parent=self.mechTab)
self.label_19.setObjectName("label_19")
self.gridLayout_4.addWidget(self.label_19, 4, 0, 1, 3)
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.starpositionButton = QtWidgets.QPushButton(parent=self.mechTab)
self.starpositionButton.setObjectName("starpositionButton")
self.verticalLayout.addWidget(self.starpositionButton)
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
self.verticalLayout.addItem(spacerItem)
self.verticalLayout.setStretch(1, 1)
self.typeTab.addTab(self.mechTab, "") self.typeTab.addTab(self.mechTab, "")
self.elecTab = QtWidgets.QWidget() self.elecTab = QtWidgets.QWidget()
self.elecTab.setObjectName("elecTab") self.elecTab.setObjectName("elecTab")
@ -215,7 +257,17 @@ class Ui_Form(object):
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.titletypeLabel.setText(_translate("Form", "T&M Type:"))
self.homingButton.setText(_translate("Form", "Homing")) 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.typeTab.setTabText(self.typeTab.indexOf(self.mechTab), _translate("Form", "Mechanical"))
self.label_4.setText(_translate("Form", "Voltage Resolution")) self.label_4.setText(_translate("Form", "Voltage Resolution"))
self.label_2.setText(_translate("Form", "Voltage Tuning")) self.label_2.setText(_translate("Form", "Voltage Tuning"))
@ -233,7 +285,9 @@ class Ui_Form(object):
self.switchATMButton.setText(_translate("Form", "ATM")) self.switchATMButton.setText(_translate("Form", "ATM"))
self.typeTab.setTabText(self.typeTab.indexOf(self.elecTab), _translate("Form", "Electrical")) self.typeTab.setTabText(self.typeTab.indexOf(self.elecTab), _translate("Form", "Electrical"))
self.titlefrequencyLabel.setText(_translate("Form", "Frequency Sweep:")) self.titlefrequencyLabel.setText(_translate("Form", "Frequency Sweep:"))
self.startEdit.setText(_translate("Form", "80"))
self.label_8.setText(_translate("Form", "MHz")) self.label_8.setText(_translate("Form", "MHz"))
self.stopEdit.setText(_translate("Form", "100"))
self.label_6.setText(_translate("Form", "MHz")) 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_5.setText(_translate("Form", "Start Frequency:")) self.label_5.setText(_translate("Form", "Start Frequency:"))