Tested machine update

This commit is contained in:
2025-05-28 12:08:45 +02:00
parent fa3c51a1a2
commit 3dd82d9c7f
9 changed files with 137 additions and 26 deletions
+4 -6
View File
@@ -2,15 +2,12 @@
# 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.9.2
#
# 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.
# WARNING! All changes made in this file will be lost!
from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_OpticsPlotGUI(object):
def setupUi(self, OpticsPlotGUI):
OpticsPlotGUI.setObjectName("OpticsPlotGUI")
@@ -314,7 +311,7 @@ class Ui_OpticsPlotGUI(object):
self.retranslateUi(OpticsPlotGUI)
self.TabMaster.setCurrentIndex(0)
self.actionQuit.triggered.connect(OpticsPlotGUI.close) # type: ignore
self.actionQuit.triggered.connect(OpticsPlotGUI.close)
QtCore.QMetaObject.connectSlotsByName(OpticsPlotGUI)
def retranslateUi(self, OpticsPlotGUI):
@@ -404,3 +401,4 @@ class Ui_OpticsPlotGUI(object):
self.actionLoad_Reference.setText(_translate("OpticsPlotGUI", "Load Reference..."))
self.actionSave_Reference.setText(_translate("OpticsPlotGUI", "Save Reference"))
self.actionNew_Reference.setText(_translate("OpticsPlotGUI", "New Reference"))
+33 -8
View File
@@ -2,15 +2,12 @@
# 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.9.2
#
# 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.
# WARNING! All changes made in this file will be lost!
from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_OpticsGUI(object):
def setupUi(self, OpticsGUI):
OpticsGUI.setObjectName("OpticsGUI")
@@ -31,6 +28,11 @@ class Ui_OpticsGUI(object):
self.horizontalLayout = QtWidgets.QHBoxLayout(self.tab_3)
self.horizontalLayout.setObjectName("horizontalLayout")
self.widget_2 = QtWidgets.QWidget(self.tab_3)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.widget_2.sizePolicy().hasHeightForWidth())
self.widget_2.setSizePolicy(sizePolicy)
self.widget_2.setObjectName("widget_2")
self.verticalLayout = QtWidgets.QVBoxLayout(self.widget_2)
self.verticalLayout.setObjectName("verticalLayout")
@@ -245,6 +247,26 @@ class Ui_OpticsGUI(object):
self.verticalLayout.addLayout(self.gridLayout_3)
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.verticalLayout.addItem(spacerItem)
self.UIUpdateFromMachine = QtWidgets.QPushButton(self.widget_2)
self.UIUpdateFromMachine.setObjectName("UIUpdateFromMachine")
self.verticalLayout.addWidget(self.UIUpdateFromMachine)
self.label_13 = QtWidgets.QLabel(self.widget_2)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.label_13.sizePolicy().hasHeightForWidth())
self.label_13.setSizePolicy(sizePolicy)
self.label_13.setObjectName("label_13")
self.verticalLayout.addWidget(self.label_13)
self.UIStatus = QtWidgets.QLineEdit(self.widget_2)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.UIStatus.sizePolicy().hasHeightForWidth())
self.UIStatus.setSizePolicy(sizePolicy)
self.UIStatus.setMinimumSize(QtCore.QSize(150, 0))
self.UIStatus.setObjectName("UIStatus")
self.verticalLayout.addWidget(self.UIStatus)
self.horizontalLayout.addWidget(self.widget_2)
spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout.addItem(spacerItem1)
@@ -449,7 +471,7 @@ class Ui_OpticsGUI(object):
self.verticalLayout_4.addWidget(self.TabMaster)
OpticsGUI.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(OpticsGUI)
self.menubar.setGeometry(QtCore.QRect(0, 0, 813, 22))
self.menubar.setGeometry(QtCore.QRect(0, 0, 813, 20))
self.menubar.setObjectName("menubar")
self.menuFile = QtWidgets.QMenu(self.menubar)
self.menuFile.setObjectName("menuFile")
@@ -575,8 +597,8 @@ class Ui_OpticsGUI(object):
self.menubar.addAction(self.menuHelp.menuAction())
self.retranslateUi(OpticsGUI)
self.TabMaster.setCurrentIndex(2)
self.actionQuit.triggered.connect(OpticsGUI.close) # type: ignore
self.TabMaster.setCurrentIndex(0)
self.actionQuit.triggered.connect(OpticsGUI.close)
QtCore.QMetaObject.connectSlotsByName(OpticsGUI)
def retranslateUi(self, OpticsGUI):
@@ -609,6 +631,8 @@ class Ui_OpticsGUI(object):
self.UIEtapy.setText(_translate("OpticsGUI", "30"))
self.UIY.setText(_translate("OpticsGUI", "30"))
self.UIPY.setText(_translate("OpticsGUI", "30"))
self.UIUpdateFromMachine.setText(_translate("OpticsGUI", "Update Model from Machine"))
self.label_13.setText(_translate("OpticsGUI", "Status"))
self.TabMaster.setTabText(self.TabMaster.indexOf(self.tab_3), _translate("OpticsGUI", "Track"))
self.groupBox_8.setTitle(_translate("OpticsGUI", "Magnets (Angle/ k1L / k2L)"))
self.label_23.setText(_translate("OpticsGUI", "Start"))
@@ -699,3 +723,4 @@ class Ui_OpticsGUI(object):
self.actionSave_Reference.setText(_translate("OpticsGUI", "Save Reference"))
self.actionNew_Reference.setText(_translate("OpticsGUI", "New Reference"))
self.actionSave.setText(_translate("OpticsGUI", "Save Settings..."))
+44 -2
View File
@@ -24,7 +24,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab_3">
<attribute name="title">
@@ -33,6 +33,12 @@
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QWidget" name="widget_2" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPushButton" name="UITrack">
@@ -394,6 +400,42 @@
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="UIUpdateFromMachine">
<property name="text">
<string>Update Model from Machine</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_13">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Status</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="UIStatus">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@@ -757,7 +799,7 @@
<x>0</x>
<y>0</y>
<width>813</width>
<height>22</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">