Skip to content

Commit

Permalink
queryPump directly in SEC_GUI\ code, threaded pump action commands
Browse files Browse the repository at this point in the history 
todo: add this to WASH_GUI code.

Threaded the 4 Adjustments buttons, like Dispense

Identified that issues #31 and #32 exist
  • Loading branch information
@dpk9
dpk9 committed Sep 3, 2024
1 parent 3754098 commit 1fa0d18
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 92 deletions.
26 changes: 8 additions & 18 deletions SEC_GUI/mainwindow.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Form implementation generated from reading ui file 'mainwindow.ui'
#
# Created by: PyQt5 UI code generator 5.15.9
# 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.
Expand Down Expand Up @@ -80,7 +80,6 @@ def setupUi(self, MainWindow):
self.columnSelectBox.setGeometry(QtCore.QRect(10, 90, 441, 261))
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.columnSelectBox.setFont(font)
self.columnSelectBox.setObjectName("columnSelectBox")
self.layoutWidget2 = QtWidgets.QWidget(self.columnSelectBox)
Expand All @@ -96,7 +95,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(12)
font.setBold(False)
font.setWeight(50)
self.allCheckBox.setFont(font)
self.allCheckBox.setStyleSheet("QCheckBox::indicator {\n"
" width: 40px;\n"
Expand Down Expand Up @@ -141,7 +139,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(12)
font.setBold(False)
font.setWeight(50)
self.column1CheckBox.setFont(font)
self.column1CheckBox.setStyleSheet("QCheckBox::indicator {\n"
" width: 40px;\n"
Expand Down Expand Up @@ -184,7 +181,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(12)
font.setBold(False)
font.setWeight(50)
self.column2CheckBox.setFont(font)
self.column2CheckBox.setStyleSheet("QCheckBox::indicator {\n"
" width: 40px;\n"
Expand Down Expand Up @@ -227,7 +223,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(12)
font.setBold(False)
font.setWeight(50)
self.column3CheckBox.setFont(font)
self.column3CheckBox.setStyleSheet("QCheckBox::indicator {\n"
" width: 40px;\n"
Expand Down Expand Up @@ -270,7 +265,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(12)
font.setBold(False)
font.setWeight(50)
self.column4CheckBox.setFont(font)
self.column4CheckBox.setStyleSheet("QCheckBox::indicator {\n"
" width: 40px;\n"
Expand Down Expand Up @@ -316,7 +310,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(12)
font.setBold(False)
font.setWeight(50)
self.column5CheckBox.setFont(font)
self.column5CheckBox.setStyleSheet("QCheckBox::indicator {\n"
" width: 40px;\n"
Expand Down Expand Up @@ -359,7 +352,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(12)
font.setBold(False)
font.setWeight(50)
self.column6CheckBox.setFont(font)
self.column6CheckBox.setStyleSheet("QCheckBox::indicator {\n"
" width: 40px;\n"
Expand Down Expand Up @@ -402,7 +394,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(12)
font.setBold(False)
font.setWeight(50)
self.column7CheckBox.setFont(font)
self.column7CheckBox.setStyleSheet("QCheckBox::indicator {\n"
" width: 40px;\n"
Expand Down Expand Up @@ -445,7 +436,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(12)
font.setBold(False)
font.setWeight(50)
self.column8CheckBox.setFont(font)
self.column8CheckBox.setStyleSheet("QCheckBox::indicator {\n"
" width: 40px;\n"
Expand Down Expand Up @@ -503,7 +493,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(14)
font.setBold(True)
font.setWeight(75)
self.dispenseSpinBox.setFont(font)
self.dispenseSpinBox.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.dispenseSpinBox.setDecimals(2)
Expand All @@ -514,7 +503,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(14)
font.setBold(True)
font.setWeight(75)
self.dispenseUnits.setFont(font)
self.dispenseUnits.setObjectName("dispenseUnits")
self.horizontalLayout_4.addWidget(self.dispenseUnits)
Expand Down Expand Up @@ -549,7 +537,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(14)
font.setBold(True)
font.setWeight(75)
self.drawSpeedSpinBox.setFont(font)
self.drawSpeedSpinBox.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.drawSpeedSpinBox.setDecimals(0)
Expand All @@ -560,7 +547,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(14)
font.setBold(True)
font.setWeight(75)
self.drawSpeedUnits.setFont(font)
self.drawSpeedUnits.setObjectName("drawSpeedUnits")
self.horizontalLayout_6.addWidget(self.drawSpeedUnits)
Expand All @@ -580,7 +566,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(14)
font.setBold(True)
font.setWeight(75)
self.dispenseSpeedSpinBox.setFont(font)
self.dispenseSpeedSpinBox.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.dispenseSpeedSpinBox.setDecimals(0)
Expand All @@ -591,7 +576,6 @@ def setupUi(self, MainWindow):
font = QtGui.QFont()
font.setPointSize(14)
font.setBold(True)
font.setWeight(75)
self.dispenseSpeedUnits.setFont(font)
self.dispenseSpeedUnits.setObjectName("dispenseSpeedUnits")
self.horizontalLayout_7.addWidget(self.dispenseSpeedUnits)
Expand Down Expand Up @@ -623,7 +607,7 @@ def setupUi(self, MainWindow):
self.horizontalLayout_8.addLayout(self.verticalLayout)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 480, 21))
self.menubar.setGeometry(QtCore.QRect(0, 0, 480, 19))
self.menubar.setObjectName("menubar")
self.menuFile = QtWidgets.QMenu(self.menubar)
self.menuFile.setObjectName("menuFile")
Expand All @@ -636,7 +620,11 @@ def setupUi(self, MainWindow):
self.actionConsole = QtWidgets.QAction(MainWindow)
self.actionConsole.setEnabled(False)
self.actionConsole.setObjectName("actionConsole")
self.actionQueryPump = QtWidgets.QAction(MainWindow)
self.actionQueryPump.setObjectName("actionQueryPump")
self.menuFile.addAction(self.actionConsole)
self.menuFile.addAction(self.actionQueryPump)
self.menuFile.addSeparator()
self.menuFile.addAction(self.actionQuit)
self.menubar.addAction(self.menuFile.menuAction())

Expand Down Expand Up @@ -728,6 +716,8 @@ def retranslateUi(self, MainWindow):
self.actionQuit.setShortcut(_translate("MainWindow", "Ctrl+Q"))
self.actionConsole.setText(_translate("MainWindow", "Console"))
self.actionConsole.setStatusTip(_translate("MainWindow", "Open a console for manual serial commands. Connection must be open."))
self.actionQueryPump.setText(_translate("MainWindow", "queryPump"))
self.actionQueryPump.setShortcut(_translate("MainWindow", "Ctrl+U"))


if __name__ == "__main__":
Expand Down
28 changes: 11 additions & 17 deletions SEC_GUI/mainwindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand All @@ -249,7 +248,6 @@
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand Down Expand Up @@ -302,7 +300,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand Down Expand Up @@ -353,7 +350,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand Down Expand Up @@ -404,7 +400,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand Down Expand Up @@ -455,7 +450,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand Down Expand Up @@ -510,7 +504,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand Down Expand Up @@ -561,7 +554,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand Down Expand Up @@ -612,7 +604,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand Down Expand Up @@ -663,7 +654,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
Expand Down Expand Up @@ -760,7 +750,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
Expand All @@ -780,7 +769,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -847,7 +835,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
Expand All @@ -867,7 +854,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -904,7 +890,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
Expand All @@ -924,7 +909,6 @@ QCheckBox::indicator:unchecked:disabled
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -1012,14 +996,16 @@ QCheckBox::indicator:unchecked:disabled
<x>0</x>
<y>0</y>
<width>480</width>
<height>21</height>
<height>19</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
<property name="title">
<string>File</string>
</property>
<addaction name="actionConsole"/>
<addaction name="actionQueryPump"/>
<addaction name="separator"/>
<addaction name="actionQuit"/>
</widget>
<addaction name="menuFile"/>
Expand Down Expand Up @@ -1047,6 +1033,14 @@ QCheckBox::indicator:unchecked:disabled
<string>Open a console for manual serial commands. Connection must be open.</string>
</property>
</action>
<action name="actionQueryPump">
<property name="text">
<string>queryPump</string>
</property>
<property name="shortcut">
<string>Ctrl+U</string>
</property>
</action>
</widget>
<tabstops>
<tabstop>comPortComboBox</tabstop>
Expand Down
Loading

0 comments on commit 1fa0d18

Please sign in to comment.