diff --git a/src/nqrduck_autotm/model.py b/src/nqrduck_autotm/model.py
index 8ecc223..0635845 100644
--- a/src/nqrduck_autotm/model.py
+++ b/src/nqrduck_autotm/model.py
@@ -139,6 +139,9 @@ class S11Data:
* 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
def to_json(self):
diff --git a/src/nqrduck_autotm/resources/autotm_widget.ui b/src/nqrduck_autotm/resources/autotm_widget.ui
index 2b2838b..7721d6d 100644
--- a/src/nqrduck_autotm/resources/autotm_widget.ui
+++ b/src/nqrduck_autotm/resources/autotm_widget.ui
@@ -7,7 +7,7 @@
0
0
1280
- 862
+ 1011
@@ -26,6 +26,7 @@
+ 75
true
@@ -76,10 +77,58 @@
+ -
+
+
+
+ 75
+ true
+
+
+
+ T&M Settings:
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+ Stop Frequency (MHz)
+
+
+
+ -
+
+
+ -
+
+
+ Start Frequency (MHz)
+
+
+
+ -
+
+
+ Frequency Step (MHz)
+
+
+
+ -
+
+
+
+
-
+ 75
true
@@ -97,24 +146,65 @@
Mechanical
-
+
-
-
-
-
+
-
+
Home
- -
-
+
-
+
+
+
+ 75
+ true
+
+
- Step Size:
+ Stepper Control:
-
+
+
-
+
+ Tuning
+
+
+ -
+
+ Matching
+
+
+
+
+ -
+
+
+ -
+
+
+
+ -
+
+
+ +
+
+
+
+ -
+
+
+ Stepper:
+
+
+
+ -
-1000
@@ -127,68 +217,50 @@
- -
-
+
-
+
- Tuning Stepper:
-
-
-
- -
-
-
- -
-
-
-
- -
-
-
- +
-
-
-
- -
-
-
- Matching Stepper:
+ Step Size:
-
-
+
- -
+ Absolute:
-
-
+
- +
+ Go
- -
-
-
- Home
-
-
-
- -
-
-
- Stepper Control:
-
-
+
-
+
-
-
+
- Start Position
+ Saved Positions
+
+
+
+ -
+
+
+ Generate LUT
+
+
+
+ -
+
+
+ View LUT
@@ -212,15 +284,8 @@
Electrical
- -
-
-
- Voltage Resolution
-
-
-
- -
-
+
-
+
-
@@ -229,70 +294,9 @@
- -
-
-
- -
-
-
- -
-
-
-
- true
-
-
-
- Generate LUT:
-
-
-
- -
-
-
- -
-
-
- Start Voltage Sweep
-
-
-
- -
-
-
- Stop Frequency (MHz)
-
-
-
-
- -
-
-
-
- true
-
-
-
- Set Voltages:
-
-
-
- -
-
-
- RF Switch:
-
-
-
- -
-
-
- View LUT
-
-
-
-
@@ -300,6 +304,13 @@
+ -
+
+
+ Voltage Resolution
+
+
+
-
@@ -307,34 +318,46 @@
- -
-
+
-
+
+
+ -
+
+
+
+ 75
+ true
+
+
- Start Frequency (MHz)
+ Set Voltages:
- -
-
-
- -
-
+
-
+
- Frequency Step (MHz)
+ View LUT
- -
-
+
-
+
- Preamplifier
+ Start Voltage Sweep
- -
-
+
-
+
+
+
+ 75
+ true
+
+
- ATM
+ Generate LUT:
@@ -342,10 +365,42 @@
+ -
+
+
+
+ 75
+ true
+
+
+
+ RF Switch:
+
+
+
+ -
+
+
-
+
+
+ ATM
+
+
+
+ -
+
+
+ Preamplifier
+
+
+
+
+
-
+ 75
true
@@ -363,17 +418,10 @@
- -
-
+
-
+
- MHz
-
-
-
- -
-
-
- 100
+ Stop Frequency:
@@ -384,13 +432,6 @@
- -
-
-
- Stop Frequency:
-
-
-
-
@@ -398,6 +439,20 @@
+ -
+
+
+ 100
+
+
+
+ -
+
+
+ MHz
+
+
+
-
@@ -425,6 +480,7 @@
+ 75
true
@@ -443,8 +499,8 @@
0
0
- 297
- 68
+ 285
+ 83
diff --git a/src/nqrduck_autotm/view.py b/src/nqrduck_autotm/view.py
index bcf0fe9..dfaf90c 100644
--- a/src/nqrduck_autotm/view.py
+++ b/src/nqrduck_autotm/view.py
@@ -72,7 +72,7 @@ class AutoTMView(ModuleView):
)
# 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
self._ui_form.setvoltagesButton.clicked.connect(
@@ -97,7 +97,7 @@ class AutoTMView(ModuleView):
)
# 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
self.module.model.measurement_finished.connect(self.plot_measurement)
@@ -117,6 +117,7 @@ class AutoTMView(ModuleView):
def init_labels(self) -> None:
"""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.titlefrequencyLabel.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.show()
- def view_lut(self) -> None:
- """Creates a new Dialog that shows the currently active LUT."""
+ def view_el_lut(self) -> None:
+ """Creates a new Dialog that shows the currently active electrical LUT."""
logger.debug("View LUT")
self.lut_window = self.LutWindow(self.module)
self.lut_window.show()
diff --git a/src/nqrduck_autotm/widget.py b/src/nqrduck_autotm/widget.py
index d0a4ac4..28c26d2 100644
--- a/src/nqrduck_autotm/widget.py
+++ b/src/nqrduck_autotm/widget.py
@@ -1,6 +1,6 @@
# 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
# 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):
def setupUi(self, Form):
Form.setObjectName("Form")
- Form.resize(1280, 862)
+ Form.resize(1280, 1011)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -25,6 +25,7 @@ class Ui_Form(object):
self.titleconnectionLabel = QtWidgets.QLabel(parent=Form)
font = QtGui.QFont()
font.setBold(True)
+ font.setWeight(75)
self.titleconnectionLabel.setFont(font)
self.titleconnectionLabel.setObjectName("titleconnectionLabel")
self.verticalLayout_2.addWidget(self.titleconnectionLabel)
@@ -50,9 +51,38 @@ class Ui_Form(object):
self.connectButton = QtWidgets.QPushButton(parent=Form)
self.connectButton.setObjectName("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)
font = QtGui.QFont()
font.setBold(True)
+ font.setWeight(75)
self.titletypeLabel.setFont(font)
self.titletypeLabel.setObjectName("titletypeLabel")
self.verticalLayout_2.addWidget(self.titletypeLabel)
@@ -64,46 +94,58 @@ class Ui_Form(object):
self.verticalLayout.setObjectName("verticalLayout")
self.gridLayout_4 = QtWidgets.QGridLayout()
self.gridLayout_4.setObjectName("gridLayout_4")
- 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.homeButton = QtWidgets.QPushButton(parent=self.mechTab)
+ self.homeButton.setObjectName("homeButton")
+ self.gridLayout_4.addWidget(self.homeButton, 4, 1, 1, 1)
+ self.label_16 = QtWidgets.QLabel(parent=self.mechTab)
+ font = QtGui.QFont()
+ 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.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.gridLayout_4.addWidget(self.stepsizeBox, 2, 1, 1, 1)
+ self.label_17 = QtWidgets.QLabel(parent=self.mechTab)
+ self.label_17.setObjectName("label_17")
+ self.gridLayout_4.addWidget(self.label_17, 2, 0, 1, 1)
+ self.label_20 = QtWidgets.QLabel(parent=self.mechTab)
+ self.label_20.setObjectName("label_20")
+ self.gridLayout_4.addWidget(self.label_20, 5, 0, 1, 1)
+ self.absoluteGoButton = QtWidgets.QPushButton(parent=self.mechTab)
+ self.absoluteGoButton.setObjectName("absoluteGoButton")
+ self.gridLayout_4.addWidget(self.absoluteGoButton, 5, 2, 1, 1)
+ self.absoluteposBox = QtWidgets.QSpinBox(parent=self.mechTab)
+ self.absoluteposBox.setObjectName("absoluteposBox")
+ self.gridLayout_4.addWidget(self.absoluteposBox, 5, 1, 1, 1)
self.verticalLayout.addLayout(self.gridLayout_4)
- self.starpositionButton = QtWidgets.QPushButton(parent=self.mechTab)
- self.starpositionButton.setObjectName("starpositionButton")
- self.verticalLayout.addWidget(self.starpositionButton)
+ self.positionButton = QtWidgets.QPushButton(parent=self.mechTab)
+ self.positionButton.setObjectName("positionButton")
+ 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)
self.verticalLayout.addItem(spacerItem)
self.verticalLayout.setStretch(1, 1)
@@ -112,77 +154,69 @@ class Ui_Form(object):
self.elecTab.setObjectName("elecTab")
self.gridLayout_3 = QtWidgets.QGridLayout(self.elecTab)
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.setObjectName("matchingBox")
self.gridLayout_3.addWidget(self.matchingBox, 2, 1, 1, 1)
- self.label_14 = QtWidgets.QLabel(parent=self.elecTab)
- self.label_14.setObjectName("label_14")
- self.gridLayout_3.addWidget(self.label_14, 8, 0, 1, 1)
- self.switchpreampButton = QtWidgets.QPushButton(parent=self.elecTab)
- self.switchpreampButton.setObjectName("switchpreampButton")
- self.gridLayout_3.addWidget(self.switchpreampButton, 12, 0, 1, 1)
- self.switchATMButton = QtWidgets.QPushButton(parent=self.elecTab)
- self.switchATMButton.setObjectName("switchATMButton")
- self.gridLayout_3.addWidget(self.switchATMButton, 12, 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.resolutionBox = QtWidgets.QDoubleSpinBox(parent=self.elecTab)
+ self.resolutionBox.setObjectName("resolutionBox")
+ self.gridLayout_3.addWidget(self.resolutionBox, 5, 1, 1, 1)
+ self.setvoltagesButton = QtWidgets.QPushButton(parent=self.elecTab)
+ self.setvoltagesButton.setObjectName("setvoltagesButton")
+ 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.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)
font = QtGui.QFont()
font.setBold(True)
+ font.setWeight(75)
self.titlefrequencyLabel.setFont(font)
self.titlefrequencyLabel.setObjectName("titlefrequencyLabel")
self.verticalLayout_2.addWidget(self.titlefrequencyLabel)
@@ -191,21 +225,21 @@ class Ui_Form(object):
self.startEdit = QtWidgets.QLineEdit(parent=Form)
self.startEdit.setObjectName("startEdit")
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.setObjectName("label_7")
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.setObjectName("label_5")
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.startButton = QtWidgets.QPushButton(parent=Form)
self.startButton.setObjectName("startButton")
@@ -219,6 +253,7 @@ class Ui_Form(object):
self.titleinfoLabel = QtWidgets.QLabel(parent=Form)
font = QtGui.QFont()
font.setBold(True)
+ font.setWeight(75)
self.titleinfoLabel.setFont(font)
self.titleinfoLabel.setObjectName("titleinfoLabel")
self.verticalLayout_2.addWidget(self.titleinfoLabel)
@@ -226,7 +261,7 @@ class Ui_Form(object):
self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea")
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.scrollArea.setWidget(self.scrollAreaWidgetContents)
self.verticalLayout_2.addWidget(self.scrollArea)
@@ -256,41 +291,44 @@ class Ui_Form(object):
self.label.setText(_translate("Form", "Port:"))
self.label_10.setText(_translate("Form", "Connected to:"))
self.connectButton.setText(_translate("Form", "Connect"))
- self.titletypeLabel.setText(_translate("Form", "T&M Type:"))
- 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.tmsettingsLabel.setText(_translate("Form", "T&M Settings:"))
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_14.setText(_translate("Form", "Frequency Step (MHz)"))
- self.switchpreampButton.setText(_translate("Form", "Preamplifier"))
- self.switchATMButton.setText(_translate("Form", "ATM"))
+ self.titletypeLabel.setText(_translate("Form", "T&M Type:"))
+ 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.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.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_6.setText(_translate("Form", "MHz"))
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.calibrationButton.setText(_translate("Form", "Calibrate"))
self.pushButton_3.setText(_translate("Form", "T&M Settings"))