Basic matching by scripts is working. Program needs some serious clean-up
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
# Form implementation generated from reading ui file 'ui/OpticsPlotGui.ui'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.15.10
|
||||
# Created by: PyQt5 UI code generator 5.15.11
|
||||
#
|
||||
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
|
||||
# run again. Do not edit this file unless you know what you are doing.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
# Form implementation generated from reading ui file 'ui/OpticsToolsGui.ui'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.15.10
|
||||
# Created by: PyQt5 UI code generator 5.15.11
|
||||
#
|
||||
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
|
||||
# run again. Do not edit this file unless you know what you are doing.
|
||||
@@ -365,6 +365,24 @@ class Ui_OpticsGUI(object):
|
||||
self.horizontalLayout_9.setObjectName("horizontalLayout_9")
|
||||
self.verticalLayout_6 = QtWidgets.QVBoxLayout()
|
||||
self.verticalLayout_6.setObjectName("verticalLayout_6")
|
||||
self.label_31 = QtWidgets.QLabel(self.tab_2)
|
||||
self.label_31.setObjectName("label_31")
|
||||
self.verticalLayout_6.addWidget(self.label_31)
|
||||
self.UIMatchOpticsSelect = QtWidgets.QComboBox(self.tab_2)
|
||||
self.UIMatchOpticsSelect.setObjectName("UIMatchOpticsSelect")
|
||||
self.verticalLayout_6.addWidget(self.UIMatchOpticsSelect)
|
||||
self.UIMatchInjector = QtWidgets.QCheckBox(self.tab_2)
|
||||
self.UIMatchInjector.setObjectName("UIMatchInjector")
|
||||
self.verticalLayout_6.addWidget(self.UIMatchInjector)
|
||||
self.UIMatchAthos = QtWidgets.QCheckBox(self.tab_2)
|
||||
self.UIMatchAthos.setObjectName("UIMatchAthos")
|
||||
self.verticalLayout_6.addWidget(self.UIMatchAthos)
|
||||
self.UIMatchPorthos = QtWidgets.QCheckBox(self.tab_2)
|
||||
self.UIMatchPorthos.setObjectName("UIMatchPorthos")
|
||||
self.verticalLayout_6.addWidget(self.UIMatchPorthos)
|
||||
self.UIMatchAramis = QtWidgets.QCheckBox(self.tab_2)
|
||||
self.UIMatchAramis.setObjectName("UIMatchAramis")
|
||||
self.verticalLayout_6.addWidget(self.UIMatchAramis)
|
||||
self.UIMatchSelected = QtWidgets.QPushButton(self.tab_2)
|
||||
font = QtGui.QFont()
|
||||
font.setPointSize(12)
|
||||
@@ -681,7 +699,7 @@ class Ui_OpticsGUI(object):
|
||||
self.menubar.addAction(self.menuHelp.menuAction())
|
||||
|
||||
self.retranslateUi(OpticsGUI)
|
||||
self.TabMaster.setCurrentIndex(0)
|
||||
self.TabMaster.setCurrentIndex(2)
|
||||
self.actionQuit.triggered.connect(OpticsGUI.close) # type: ignore
|
||||
QtCore.QMetaObject.connectSlotsByName(OpticsGUI)
|
||||
|
||||
@@ -729,6 +747,11 @@ class Ui_OpticsGUI(object):
|
||||
self.Mach2ModUnd.setText(_translate("OpticsGUI", "Model <- Sandbox <- Machine"))
|
||||
self.SB2ModUnd.setText(_translate("OpticsGUI", "Model <- Sandbox"))
|
||||
self.TabMaster.setTabText(self.TabMaster.indexOf(self.tab_8), _translate("OpticsGUI", "Sandbox"))
|
||||
self.label_31.setText(_translate("OpticsGUI", "Optics"))
|
||||
self.UIMatchInjector.setText(_translate("OpticsGUI", "Injector"))
|
||||
self.UIMatchAthos.setText(_translate("OpticsGUI", "Athos"))
|
||||
self.UIMatchPorthos.setText(_translate("OpticsGUI", "Porthos"))
|
||||
self.UIMatchAramis.setText(_translate("OpticsGUI", "Aramis"))
|
||||
self.UIMatchSelected.setText(_translate("OpticsGUI", "Match Selected"))
|
||||
self.label_14.setText(_translate("OpticsGUI", "Label"))
|
||||
self.label_15.setText(_translate("OpticsGUI", "Matching Order (Closest Reference Point)"))
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>2</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab_3">
|
||||
<attribute name="title">
|
||||
@@ -598,6 +598,44 @@
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_9">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_6">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_31">
|
||||
<property name="text">
|
||||
<string>Optics</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="UIMatchOpticsSelect"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="UIMatchInjector">
|
||||
<property name="text">
|
||||
<string>Injector</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="UIMatchAthos">
|
||||
<property name="text">
|
||||
<string>Athos</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="UIMatchPorthos">
|
||||
<property name="text">
|
||||
<string>Porthos</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="UIMatchAramis">
|
||||
<property name="text">
|
||||
<string>Aramis</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="UIMatchSelected">
|
||||
<property name="font">
|
||||
|
||||
Reference in New Issue
Block a user