From 6462578cc74fa88dbec21809fc5f80ef525fd549 Mon Sep 17 00:00:00 2001 From: Noa Second Date: Mon, 3 Jun 2024 15:25:54 +0200 Subject: [PATCH] :lipstick: Update GUI --- GUI.ui | 500 +++++++++++++++++++++++++++++++++++++++++++++++++++--- GUI_ui.py | 182 +++++++++++++++++--- 2 files changed, 639 insertions(+), 43 deletions(-) diff --git a/GUI.ui b/GUI.ui index 65a66a8..8d24c79 100644 --- a/GUI.ui +++ b/GUI.ui @@ -33,7 +33,7 @@ QTabWidget::TabShape::Rounded - 6 + 3 false @@ -48,8 +48,8 @@ - 730 - 260 + 620 + 130 598 519 @@ -61,6 +61,136 @@ :/newPrefix/Schema Injection.png + + + + 10 + 670 + 303 + 111 + + + + + + 0 + 20 + 303 + 91 + + + + QFrame::Shape::StyledPanel + + + QFrame::Shadow::Raised + + + + + 20 + 10 + 171 + 61 + + + + + + 0 + 0 + 65 + 16 + + + + Débit Argon + + + + + + 130 + 40 + 41 + 16 + + + + ml/min + + + + + + 0 + 20 + 121 + 41 + + + + false + + + + + + + 200 + 30 + 83 + 44 + + + + + + 0 + 0 + 66 + 16 + + + + Diaphragme + + + + + + 0 + 20 + 75 + 24 + + + + On + + + true + + + true + + + + + + + + 0 + 0 + 41 + 16 + + + + Général + + + @@ -562,7 +692,7 @@ true - + 0 @@ -585,7 +715,7 @@ - µA + cm @@ -614,7 +744,7 @@ true - + 0 @@ -637,7 +767,7 @@ - µA + cm @@ -924,7 +1054,7 @@ 20 20 - 341 + 381 111 @@ -933,7 +1063,7 @@ 0 20 - 341 + 381 91 @@ -943,6 +1073,104 @@ QFrame::Shadow::Raised + + + + 20 + 10 + 161 + 61 + + + + + + 0 + 0 + 83 + 16 + + + + Sonde 1 + + + + + + 130 + 40 + 31 + 16 + + + + mbar + + + + + + 0 + 20 + 121 + 41 + + + + false + + + + + + + 200 + 10 + 161 + 61 + + + + + + 0 + 0 + 83 + 16 + + + + Sonde 2 + + + + + + 130 + 40 + 31 + 16 + + + + mbar + + + + + + 0 + 20 + 121 + 41 + + + + false + + + @@ -958,12 +1186,25 @@ + + + + 20 + 250 + 1221 + 521 + + + + QFrame::Shape::Box + + - 380 + 430 20 - 341 + 381 111 @@ -972,7 +1213,7 @@ 0 20 - 341 + 381 91 @@ -982,6 +1223,104 @@ QFrame::Shadow::Raised + + + + 20 + 10 + 161 + 61 + + + + + + 0 + 0 + 83 + 16 + + + + Sonde 1 + + + + + + 130 + 40 + 31 + 16 + + + + mbar + + + + + + 0 + 20 + 121 + 41 + + + + false + + + + + + + 200 + 10 + 161 + 61 + + + + + + 0 + 0 + 83 + 16 + + + + Sonde 2 + + + + + + 130 + 40 + 31 + 16 + + + + mbar + + + + + + 0 + 20 + 121 + 41 + + + + false + + + @@ -997,18 +1336,135 @@ - + - 20 - 250 - 1221 - 521 + 840 + 20 + 303 + 111 - - QFrame::Shape::Box - + + + + 0 + 20 + 303 + 91 + + + + QFrame::Shape::StyledPanel + + + QFrame::Shadow::Raised + + + + + 20 + 10 + 161 + 61 + + + + + + 0 + 0 + 83 + 16 + + + + Vitesse + + + + + + 130 + 40 + 22 + 16 + + + + rpm + + + + + + 0 + 20 + 121 + 41 + + + + false + + + + + + + 200 + 30 + 83 + 44 + + + + + + 0 + 0 + 33 + 16 + + + + Status + + + + + + 0 + 20 + 75 + 24 + + + + On + + + true + + + true + + + + + + + + 0 + 0 + 161 + 16 + + + + Pompe + + @@ -1018,8 +1474,8 @@ - 690 - 140 + 630 + 130 601 531 diff --git a/GUI_ui.py b/GUI_ui.py index a9461a5..bae16bd 100644 --- a/GUI_ui.py +++ b/GUI_ui.py @@ -42,8 +42,43 @@ def setupUi(self, MainWindow): self.Injection.setObjectName(u"Injection") self.label_2 = QLabel(self.Injection) self.label_2.setObjectName(u"label_2") - self.label_2.setGeometry(QRect(730, 260, 598, 519)) + self.label_2.setGeometry(QRect(620, 130, 598, 519)) self.label_2.setPixmap(QPixmap(u":/newPrefix/Schema Injection.png")) + self.Container_Injection_General = QWidget(self.Injection) + self.Container_Injection_General.setObjectName(u"Container_Injection_General") + self.Container_Injection_General.setGeometry(QRect(10, 670, 303, 111)) + self.frame_12 = QFrame(self.Container_Injection_General) + self.frame_12.setObjectName(u"frame_12") + self.frame_12.setGeometry(QRect(0, 20, 303, 91)) + self.frame_12.setFrameShape(QFrame.Shape.StyledPanel) + self.frame_12.setFrameShadow(QFrame.Shadow.Raised) + self.afficheur_14 = QWidget(self.frame_12) + self.afficheur_14.setObjectName(u"afficheur_14") + self.afficheur_14.setGeometry(QRect(20, 10, 171, 61)) + self.label_37 = QLabel(self.afficheur_14) + self.label_37.setObjectName(u"label_37") + self.label_37.setGeometry(QRect(0, 0, 65, 16)) + self.label_38 = QLabel(self.afficheur_14) + self.label_38.setObjectName(u"label_38") + self.label_38.setGeometry(QRect(130, 40, 41, 16)) + self.lcdNumber_14 = QLCDNumber(self.afficheur_14) + self.lcdNumber_14.setObjectName(u"lcdNumber_14") + self.lcdNumber_14.setGeometry(QRect(0, 20, 121, 41)) + self.lcdNumber_14.setSmallDecimalPoint(False) + self.afficheur_15 = QWidget(self.frame_12) + self.afficheur_15.setObjectName(u"afficheur_15") + self.afficheur_15.setGeometry(QRect(200, 30, 83, 44)) + self.label_39 = QLabel(self.afficheur_15) + self.label_39.setObjectName(u"label_39") + self.label_39.setGeometry(QRect(0, 0, 66, 16)) + self.pushButton_Diaphragme = QPushButton(self.afficheur_15) + self.pushButton_Diaphragme.setObjectName(u"pushButton_Diaphragme") + self.pushButton_Diaphragme.setGeometry(QRect(0, 20, 75, 24)) + self.pushButton_Diaphragme.setCheckable(True) + self.pushButton_Diaphragme.setChecked(True) + self.label_59 = QLabel(self.Container_Injection_General) + self.label_59.setObjectName(u"label_59") + self.label_59.setGeometry(QRect(0, 0, 41, 16)) self.tabWidget.addTab(self.Injection, "") self.Aimant = QWidget() self.Aimant.setObjectName(u"Aimant") @@ -186,10 +221,10 @@ def setupUi(self, MainWindow): self.label_15.setObjectName(u"label_15") self.label_15.setGeometry(QRect(0, 20, 71, 31)) self.label_15.setWordWrap(True) - self.spinBox_4 = QSpinBox(self.numInput_6) - self.spinBox_4.setObjectName(u"spinBox_4") - self.spinBox_4.setGeometry(QRect(0, 50, 121, 41)) - self.spinBox_4.setButtonSymbols(QAbstractSpinBox.ButtonSymbols.UpDownArrows) + self.spinBox_RayonCanneC1 = QSpinBox(self.numInput_6) + self.spinBox_RayonCanneC1.setObjectName(u"spinBox_RayonCanneC1") + self.spinBox_RayonCanneC1.setGeometry(QRect(0, 50, 121, 41)) + self.spinBox_RayonCanneC1.setButtonSymbols(QAbstractSpinBox.ButtonSymbols.UpDownArrows) self.label_16 = QLabel(self.numInput_6) self.label_16.setObjectName(u"label_16") self.label_16.setGeometry(QRect(130, 70, 15, 16)) @@ -200,10 +235,10 @@ def setupUi(self, MainWindow): self.label_17.setObjectName(u"label_17") self.label_17.setGeometry(QRect(0, 20, 71, 31)) self.label_17.setWordWrap(True) - self.spinBox_5 = QSpinBox(self.numInput_7) - self.spinBox_5.setObjectName(u"spinBox_5") - self.spinBox_5.setGeometry(QRect(0, 50, 121, 41)) - self.spinBox_5.setButtonSymbols(QAbstractSpinBox.ButtonSymbols.UpDownArrows) + self.spinBox_RayonCanneC2 = QSpinBox(self.numInput_7) + self.spinBox_RayonCanneC2.setObjectName(u"spinBox_RayonCanneC2") + self.spinBox_RayonCanneC2.setGeometry(QRect(0, 50, 121, 41)) + self.spinBox_RayonCanneC2.setButtonSymbols(QAbstractSpinBox.ButtonSymbols.UpDownArrows) self.label_18 = QLabel(self.numInput_7) self.label_18.setObjectName(u"label_18") self.label_18.setGeometry(QRect(130, 70, 15, 16)) @@ -285,36 +320,123 @@ def setupUi(self, MainWindow): self.Vide.setObjectName(u"Vide") self.Container_8 = QWidget(self.Vide) self.Container_8.setObjectName(u"Container_8") - self.Container_8.setGeometry(QRect(20, 20, 341, 111)) + self.Container_8.setGeometry(QRect(20, 20, 381, 111)) self.frame_9 = QFrame(self.Container_8) self.frame_9.setObjectName(u"frame_9") - self.frame_9.setGeometry(QRect(0, 20, 341, 91)) + self.frame_9.setGeometry(QRect(0, 20, 381, 91)) self.frame_9.setFrameShape(QFrame.Shape.StyledPanel) self.frame_9.setFrameShadow(QFrame.Shadow.Raised) + self.afficheur_2 = QWidget(self.frame_9) + self.afficheur_2.setObjectName(u"afficheur_2") + self.afficheur_2.setGeometry(QRect(20, 10, 161, 61)) + self.label_24 = QLabel(self.afficheur_2) + self.label_24.setObjectName(u"label_24") + self.label_24.setGeometry(QRect(0, 0, 83, 16)) + self.label_25 = QLabel(self.afficheur_2) + self.label_25.setObjectName(u"label_25") + self.label_25.setGeometry(QRect(130, 40, 31, 16)) + self.lcdNumber_2 = QLCDNumber(self.afficheur_2) + self.lcdNumber_2.setObjectName(u"lcdNumber_2") + self.lcdNumber_2.setGeometry(QRect(0, 20, 121, 41)) + self.lcdNumber_2.setSmallDecimalPoint(False) + self.afficheur_3 = QWidget(self.frame_9) + self.afficheur_3.setObjectName(u"afficheur_3") + self.afficheur_3.setGeometry(QRect(200, 10, 161, 61)) + self.label_28 = QLabel(self.afficheur_3) + self.label_28.setObjectName(u"label_28") + self.label_28.setGeometry(QRect(0, 0, 83, 16)) + self.label_29 = QLabel(self.afficheur_3) + self.label_29.setObjectName(u"label_29") + self.label_29.setGeometry(QRect(130, 40, 31, 16)) + self.lcdNumber_10 = QLCDNumber(self.afficheur_3) + self.lcdNumber_10.setObjectName(u"lcdNumber_10") + self.lcdNumber_10.setGeometry(QRect(0, 20, 121, 41)) + self.lcdNumber_10.setSmallDecimalPoint(False) self.label_53 = QLabel(self.Container_8) self.label_53.setObjectName(u"label_53") self.label_53.setGeometry(QRect(0, 0, 161, 16)) + self.listWidget_vacuum = QListWidget(self.Vide) + self.listWidget_vacuum.setObjectName(u"listWidget_vacuum") + self.listWidget_vacuum.setGeometry(QRect(20, 250, 1221, 521)) + self.listWidget_vacuum.setFrameShape(QFrame.Shape.Box) self.Container_9 = QWidget(self.Vide) self.Container_9.setObjectName(u"Container_9") - self.Container_9.setGeometry(QRect(380, 20, 341, 111)) + self.Container_9.setGeometry(QRect(430, 20, 381, 111)) self.frame_10 = QFrame(self.Container_9) self.frame_10.setObjectName(u"frame_10") - self.frame_10.setGeometry(QRect(0, 20, 341, 91)) + self.frame_10.setGeometry(QRect(0, 20, 381, 91)) self.frame_10.setFrameShape(QFrame.Shape.StyledPanel) self.frame_10.setFrameShadow(QFrame.Shadow.Raised) + self.afficheur_10 = QWidget(self.frame_10) + self.afficheur_10.setObjectName(u"afficheur_10") + self.afficheur_10.setGeometry(QRect(20, 10, 161, 61)) + self.label_30 = QLabel(self.afficheur_10) + self.label_30.setObjectName(u"label_30") + self.label_30.setGeometry(QRect(0, 0, 83, 16)) + self.label_31 = QLabel(self.afficheur_10) + self.label_31.setObjectName(u"label_31") + self.label_31.setGeometry(QRect(130, 40, 31, 16)) + self.lcdNumber_11 = QLCDNumber(self.afficheur_10) + self.lcdNumber_11.setObjectName(u"lcdNumber_11") + self.lcdNumber_11.setGeometry(QRect(0, 20, 121, 41)) + self.lcdNumber_11.setSmallDecimalPoint(False) + self.afficheur_11 = QWidget(self.frame_10) + self.afficheur_11.setObjectName(u"afficheur_11") + self.afficheur_11.setGeometry(QRect(200, 10, 161, 61)) + self.label_32 = QLabel(self.afficheur_11) + self.label_32.setObjectName(u"label_32") + self.label_32.setGeometry(QRect(0, 0, 83, 16)) + self.label_33 = QLabel(self.afficheur_11) + self.label_33.setObjectName(u"label_33") + self.label_33.setGeometry(QRect(130, 40, 31, 16)) + self.lcdNumber_12 = QLCDNumber(self.afficheur_11) + self.lcdNumber_12.setObjectName(u"lcdNumber_12") + self.lcdNumber_12.setGeometry(QRect(0, 20, 121, 41)) + self.lcdNumber_12.setSmallDecimalPoint(False) self.label_54 = QLabel(self.Container_9) self.label_54.setObjectName(u"label_54") self.label_54.setGeometry(QRect(0, 0, 161, 16)) - self.listWidget_vacuum = QListWidget(self.Vide) - self.listWidget_vacuum.setObjectName(u"listWidget_vacuum") - self.listWidget_vacuum.setGeometry(QRect(20, 250, 1221, 521)) - self.listWidget_vacuum.setFrameShape(QFrame.Shape.Box) + self.Container_10 = QWidget(self.Vide) + self.Container_10.setObjectName(u"Container_10") + self.Container_10.setGeometry(QRect(840, 20, 303, 111)) + self.frame_11 = QFrame(self.Container_10) + self.frame_11.setObjectName(u"frame_11") + self.frame_11.setGeometry(QRect(0, 20, 303, 91)) + self.frame_11.setFrameShape(QFrame.Shape.StyledPanel) + self.frame_11.setFrameShadow(QFrame.Shadow.Raised) + self.afficheur_12 = QWidget(self.frame_11) + self.afficheur_12.setObjectName(u"afficheur_12") + self.afficheur_12.setGeometry(QRect(20, 10, 161, 61)) + self.label_34 = QLabel(self.afficheur_12) + self.label_34.setObjectName(u"label_34") + self.label_34.setGeometry(QRect(0, 0, 83, 16)) + self.label_35 = QLabel(self.afficheur_12) + self.label_35.setObjectName(u"label_35") + self.label_35.setGeometry(QRect(130, 40, 22, 16)) + self.lcdNumber_13 = QLCDNumber(self.afficheur_12) + self.lcdNumber_13.setObjectName(u"lcdNumber_13") + self.lcdNumber_13.setGeometry(QRect(0, 20, 121, 41)) + self.lcdNumber_13.setSmallDecimalPoint(False) + self.afficheur_13 = QWidget(self.frame_11) + self.afficheur_13.setObjectName(u"afficheur_13") + self.afficheur_13.setGeometry(QRect(200, 30, 83, 44)) + self.label_36 = QLabel(self.afficheur_13) + self.label_36.setObjectName(u"label_36") + self.label_36.setGeometry(QRect(0, 0, 33, 16)) + self.pushButton_LogOnOff_2 = QPushButton(self.afficheur_13) + self.pushButton_LogOnOff_2.setObjectName(u"pushButton_LogOnOff_2") + self.pushButton_LogOnOff_2.setGeometry(QRect(0, 20, 75, 24)) + self.pushButton_LogOnOff_2.setCheckable(True) + self.pushButton_LogOnOff_2.setChecked(True) + self.label_58 = QLabel(self.Container_10) + self.label_58.setObjectName(u"label_58") + self.label_58.setGeometry(QRect(0, 0, 161, 16)) self.tabWidget.addTab(self.Vide, "") self.Eau = QWidget() self.Eau.setObjectName(u"Eau") self.label_23 = QLabel(self.Eau) self.label_23.setObjectName(u"label_23") - self.label_23.setGeometry(QRect(690, 140, 601, 531)) + self.label_23.setGeometry(QRect(630, 130, 601, 531)) self.label_23.setPixmap(QPixmap(u":/newPrefix/Schema Eau.png")) self.tabWidget.addTab(self.Eau, "") self.Paramtres = QWidget() @@ -411,7 +533,7 @@ def setupUi(self, MainWindow): self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(6) + self.tabWidget.setCurrentIndex(3) QMetaObject.connectSlotsByName(MainWindow) @@ -420,6 +542,11 @@ def setupUi(self, MainWindow): def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"MainWindow", None)) self.label_2.setText("") + self.label_37.setText(QCoreApplication.translate("MainWindow", u"D\u00e9bit Argon", None)) + self.label_38.setText(QCoreApplication.translate("MainWindow", u"ml/min", None)) + self.label_39.setText(QCoreApplication.translate("MainWindow", u"Diaphragme", None)) + self.pushButton_Diaphragme.setText(QCoreApplication.translate("MainWindow", u"On", None)) + self.label_59.setText(QCoreApplication.translate("MainWindow", u"G\u00e9n\u00e9ral", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.Injection), QCoreApplication.translate("MainWindow", u"Injection", None)) self.label_4.setText(QCoreApplication.translate("MainWindow", u"Courant bobine", None)) self.label_5.setText(QCoreApplication.translate("MainWindow", u"\u00b5A", None)) @@ -441,9 +568,9 @@ def retranslateUi(self, MainWindow): self.radioButton_C1S2.setText(QCoreApplication.translate("MainWindow", u"Stripper 2", None)) self.radioButton_C1S3.setText(QCoreApplication.translate("MainWindow", u"Stripper 3", None)) self.label_15.setText(QCoreApplication.translate("MainWindow", u"Rayon canne cible 1", None)) - self.label_16.setText(QCoreApplication.translate("MainWindow", u"\u00b5A", None)) + self.label_16.setText(QCoreApplication.translate("MainWindow", u"cm", None)) self.label_17.setText(QCoreApplication.translate("MainWindow", u"Rayon canne cible 2", None)) - self.label_18.setText(QCoreApplication.translate("MainWindow", u"\u00b5A", None)) + self.label_18.setText(QCoreApplication.translate("MainWindow", u"cm", None)) self.radioButton_C2S1.setText(QCoreApplication.translate("MainWindow", u"Stripper 1", None)) self.radioButton_C2S2.setText(QCoreApplication.translate("MainWindow", u"Stripper 2", None)) self.radioButton_C2S3.setText(QCoreApplication.translate("MainWindow", u"Stripper 3", None)) @@ -455,8 +582,21 @@ def retranslateUi(self, MainWindow): self.label_46.setText(QCoreApplication.translate("MainWindow", u"\u00b5A", None)) self.label_47.setText(QCoreApplication.translate("MainWindow", u"\u00b5A", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.Exxtraction), QCoreApplication.translate("MainWindow", u"Extraction", None)) + self.label_24.setText(QCoreApplication.translate("MainWindow", u"Sonde 1", None)) + self.label_25.setText(QCoreApplication.translate("MainWindow", u"mbar", None)) + self.label_28.setText(QCoreApplication.translate("MainWindow", u"Sonde 2", None)) + self.label_29.setText(QCoreApplication.translate("MainWindow", u"mbar", None)) self.label_53.setText(QCoreApplication.translate("MainWindow", u"Vide primaire", None)) + self.label_30.setText(QCoreApplication.translate("MainWindow", u"Sonde 1", None)) + self.label_31.setText(QCoreApplication.translate("MainWindow", u"mbar", None)) + self.label_32.setText(QCoreApplication.translate("MainWindow", u"Sonde 2", None)) + self.label_33.setText(QCoreApplication.translate("MainWindow", u"mbar", None)) self.label_54.setText(QCoreApplication.translate("MainWindow", u"Vide secondaire", None)) + self.label_34.setText(QCoreApplication.translate("MainWindow", u"Vitesse", None)) + self.label_35.setText(QCoreApplication.translate("MainWindow", u"rpm", None)) + self.label_36.setText(QCoreApplication.translate("MainWindow", u"Status", None)) + self.pushButton_LogOnOff_2.setText(QCoreApplication.translate("MainWindow", u"On", None)) + self.label_58.setText(QCoreApplication.translate("MainWindow", u"Pompe", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.Vide), QCoreApplication.translate("MainWindow", u"Vide", None)) self.label_23.setText("") self.tabWidget.setTabText(self.tabWidget.indexOf(self.Eau), QCoreApplication.translate("MainWindow", u"Eau", None))