@@ -73,7 +73,7 @@ def setupUi(self, mainWindow):
73
73
self .groupBox .setGeometry (QtCore .QRect (300 , 0 , 281 , 331 ))
74
74
self .groupBox .setObjectName ("groupBox" )
75
75
self .frame_3 = QtWidgets .QFrame (self .groupBox )
76
- self .frame_3 .setGeometry (QtCore .QRect (0 , 20 , 203 , 201 ))
76
+ self .frame_3 .setGeometry (QtCore .QRect (0 , 20 , 251 , 197 ))
77
77
self .frame_3 .setStyleSheet ("background-color: rgb(224, 224, 168);" )
78
78
self .frame_3 .setFrameShape (QtWidgets .QFrame .NoFrame )
79
79
self .frame_3 .setFrameShadow (QtWidgets .QFrame .Raised )
@@ -82,13 +82,13 @@ def setupUi(self, mainWindow):
82
82
self .gridLayout_2 .setContentsMargins (6 , 6 , 6 , 6 )
83
83
self .gridLayout_2 .setSpacing (4 )
84
84
self .gridLayout_2 .setObjectName ("gridLayout_2" )
85
- self .label_3 = QtWidgets .QLabel (self .frame_3 )
85
+ self .label_6 = QtWidgets .QLabel (self .frame_3 )
86
86
font = QtGui .QFont ()
87
87
font .setFamily ("LED Calculator" )
88
88
font .setPointSize (20 )
89
- self .label_3 .setFont (font )
90
- self .label_3 .setObjectName ("label_3 " )
91
- self .gridLayout_2 .addWidget (self .label_3 , 0 , 0 , 1 , 1 )
89
+ self .label_6 .setFont (font )
90
+ self .label_6 .setObjectName ("label_6 " )
91
+ self .gridLayout_2 .addWidget (self .label_6 , 5 , 0 , 1 , 1 )
92
92
self .lblPosX = QtWidgets .QLabel (self .frame_3 )
93
93
self .lblPosX .setMinimumSize (QtCore .QSize (170 , 0 ))
94
94
font = QtGui .QFont ()
@@ -98,6 +98,13 @@ def setupUi(self, mainWindow):
98
98
self .lblPosX .setAlignment (QtCore .Qt .AlignRight | QtCore .Qt .AlignTrailing | QtCore .Qt .AlignVCenter )
99
99
self .lblPosX .setObjectName ("lblPosX" )
100
100
self .gridLayout_2 .addWidget (self .lblPosX , 0 , 1 , 1 , 1 )
101
+ self .label_3 = QtWidgets .QLabel (self .frame_3 )
102
+ font = QtGui .QFont ()
103
+ font .setFamily ("LED Calculator" )
104
+ font .setPointSize (20 )
105
+ self .label_3 .setFont (font )
106
+ self .label_3 .setObjectName ("label_3" )
107
+ self .gridLayout_2 .addWidget (self .label_3 , 0 , 0 , 1 , 1 )
101
108
self .label_4 = QtWidgets .QLabel (self .frame_3 )
102
109
font = QtGui .QFont ()
103
110
font .setFamily ("LED Calculator" )
@@ -130,13 +137,6 @@ def setupUi(self, mainWindow):
130
137
self .lblPosZ .setAlignment (QtCore .Qt .AlignRight | QtCore .Qt .AlignTrailing | QtCore .Qt .AlignVCenter )
131
138
self .lblPosZ .setObjectName ("lblPosZ" )
132
139
self .gridLayout_2 .addWidget (self .lblPosZ , 2 , 1 , 2 , 1 )
133
- self .label_6 = QtWidgets .QLabel (self .frame_3 )
134
- font = QtGui .QFont ()
135
- font .setFamily ("LED Calculator" )
136
- font .setPointSize (20 )
137
- self .label_6 .setFont (font )
138
- self .label_6 .setObjectName ("label_6" )
139
- self .gridLayout_2 .addWidget (self .label_6 , 3 , 0 , 2 , 1 )
140
140
self .lblPosA = QtWidgets .QLabel (self .frame_3 )
141
141
self .lblPosA .setMinimumSize (QtCore .QSize (170 , 0 ))
142
142
font = QtGui .QFont ()
@@ -145,14 +145,7 @@ def setupUi(self, mainWindow):
145
145
self .lblPosA .setFont (font )
146
146
self .lblPosA .setAlignment (QtCore .Qt .AlignRight | QtCore .Qt .AlignTrailing | QtCore .Qt .AlignVCenter )
147
147
self .lblPosA .setObjectName ("lblPosA" )
148
- self .gridLayout_2 .addWidget (self .lblPosA , 4 , 1 , 2 , 1 )
149
- self .label_7 = QtWidgets .QLabel (self .frame_3 )
150
- font = QtGui .QFont ()
151
- font .setFamily ("LED Calculator" )
152
- font .setPointSize (20 )
153
- self .label_7 .setFont (font )
154
- self .label_7 .setObjectName ("label_7" )
155
- self .gridLayout_2 .addWidget (self .label_7 , 5 , 0 , 2 , 1 )
148
+ self .gridLayout_2 .addWidget (self .lblPosA , 4 , 1 , 4 , 1 )
156
149
self .lblPosB = QtWidgets .QLabel (self .frame_3 )
157
150
self .lblPosB .setMinimumSize (QtCore .QSize (170 , 0 ))
158
151
font = QtGui .QFont ()
@@ -161,11 +154,19 @@ def setupUi(self, mainWindow):
161
154
self .lblPosB .setFont (font )
162
155
self .lblPosB .setAlignment (QtCore .Qt .AlignRight | QtCore .Qt .AlignTrailing | QtCore .Qt .AlignVCenter )
163
156
self .lblPosB .setObjectName ("lblPosB" )
164
- self .gridLayout_2 .addWidget (self .lblPosB , 6 , 1 , 1 , 1 )
157
+ self .gridLayout_2 .addWidget (self .lblPosB , 8 , 1 , 1 , 1 )
158
+ self .label_7 = QtWidgets .QLabel (self .frame_3 )
159
+ font = QtGui .QFont ()
160
+ font .setFamily ("LED Calculator" )
161
+ font .setPointSize (20 )
162
+ self .label_7 .setFont (font )
163
+ self .label_7 .setObjectName ("label_7" )
164
+ self .gridLayout_2 .addWidget (self .label_7 , 8 , 0 , 1 , 1 )
165
165
self .groupBox_2 = QtWidgets .QGroupBox (self .tab )
166
166
self .groupBox_2 .setGeometry (QtCore .QRect (10 , 120 , 281 , 211 ))
167
167
self .groupBox_2 .setObjectName ("groupBox_2" )
168
168
self .btnStart = QtWidgets .QPushButton (self .groupBox_2 )
169
+ self .btnStart .setEnabled (False )
169
170
self .btnStart .setGeometry (QtCore .QRect (10 , 150 , 50 , 50 ))
170
171
self .btnStart .setMinimumSize (QtCore .QSize (50 , 50 ))
171
172
self .btnStart .setMaximumSize (QtCore .QSize (50 , 50 ))
@@ -178,7 +179,7 @@ def setupUi(self, mainWindow):
178
179
self .btnStart .setIconSize (QtCore .QSize (50 , 50 ))
179
180
self .btnStart .setObjectName ("btnStart" )
180
181
self .btnStop = QtWidgets .QPushButton (self .groupBox_2 )
181
- self .btnStop .setEnabled (True )
182
+ self .btnStop .setEnabled (False )
182
183
self .btnStop .setGeometry (QtCore .QRect (80 , 150 , 50 , 50 ))
183
184
self .btnStop .setMinimumSize (QtCore .QSize (50 , 50 ))
184
185
self .btnStop .setMaximumSize (QtCore .QSize (50 , 50 ))
@@ -213,23 +214,23 @@ def setupUi(self, mainWindow):
213
214
self .tabWidget .addTab (self .tab_2 , "" )
214
215
self .verticalLayout .addWidget (self .tabWidget )
215
216
mainWindow .setCentralWidget (self .centralwidget )
216
- self .menubar = QtWidgets .QMenuBar (mainWindow )
217
- self .menubar .setGeometry (QtCore .QRect (0 , 0 , 1024 , 20 ))
218
- self .menubar .setObjectName ("menubar " )
219
- self .menu_Application = QtWidgets .QMenu (self .menubar )
220
- self .menu_Application .setObjectName ("menu_Application " )
221
- mainWindow .setMenuBar (self .menubar )
217
+ self .mnuBar = QtWidgets .QMenuBar (mainWindow )
218
+ self .mnuBar .setGeometry (QtCore .QRect (0 , 0 , 1024 , 22 ))
219
+ self .mnuBar .setObjectName ("mnuBar " )
220
+ self .mnuApplication = QtWidgets .QMenu (self .mnuBar )
221
+ self .mnuApplication .setObjectName ("mnuApplication " )
222
+ mainWindow .setMenuBar (self .mnuBar )
222
223
self .statusBar = QtWidgets .QStatusBar (mainWindow )
223
224
self .statusBar .setObjectName ("statusBar" )
224
225
mainWindow .setStatusBar (self .statusBar )
225
- self .actionOuvrir_un_fichier_GCode = QtWidgets .QAction (mainWindow )
226
- self .actionOuvrir_un_fichier_GCode .setObjectName ("actionOuvrir_un_fichier_GCode " )
227
- self .action_Quitter = QtWidgets .QAction (mainWindow )
228
- self .action_Quitter .setObjectName ("action_Quitter " )
229
- self .menu_Application .addAction (self .actionOuvrir_un_fichier_GCode )
230
- self .menu_Application .addSeparator ()
231
- self .menu_Application .addAction (self .action_Quitter )
232
- self .menubar .addAction (self .menu_Application .menuAction ())
226
+ self .mnuAppOuvrir = QtWidgets .QAction (mainWindow )
227
+ self .mnuAppOuvrir .setObjectName ("mnuAppOuvrir " )
228
+ self .mnuAppQuitter = QtWidgets .QAction (mainWindow )
229
+ self .mnuAppQuitter .setObjectName ("mnuAppQuitter " )
230
+ self .mnuApplication .addAction (self .mnuAppOuvrir )
231
+ self .mnuApplication .addSeparator ()
232
+ self .mnuApplication .addAction (self .mnuAppQuitter )
233
+ self .mnuBar .addAction (self .mnuApplication .menuAction ())
233
234
234
235
self .retranslateUi (mainWindow )
235
236
self .tabWidget .setCurrentIndex (0 )
@@ -245,20 +246,21 @@ def retranslateUi(self, mainWindow):
245
246
self .lblConnectStatus .setText (_translate ("mainWindow" , "<Non Connecté>" ))
246
247
self .btnConnect .setText (_translate ("mainWindow" , "(Dé)Connecter" ))
247
248
self .groupBox .setTitle (_translate ("mainWindow" , "Machine status" ))
248
- self .label_3 .setText (_translate ("mainWindow" , "X " ))
249
+ self .label_6 .setText (_translate ("mainWindow" , "A " ))
249
250
self .lblPosX .setText (_translate ("mainWindow" , "+0.000" ))
251
+ self .label_3 .setText (_translate ("mainWindow" , "X" ))
250
252
self .label_4 .setText (_translate ("mainWindow" , "Y" ))
251
253
self .lblPosY .setText (_translate ("mainWindow" , "+0.000" ))
252
254
self .label_5 .setText (_translate ("mainWindow" , "Z" ))
253
255
self .lblPosZ .setText (_translate ("mainWindow" , "+0.000" ))
254
- self .label_6 .setText (_translate ("mainWindow" , "A" ))
255
256
self .lblPosA .setText (_translate ("mainWindow" , "+0.000" ))
256
- self .label_7 .setText (_translate ("mainWindow" , "B" ))
257
257
self .lblPosB .setText (_translate ("mainWindow" , "+0.000" ))
258
+ self .label_7 .setText (_translate ("mainWindow" , "B" ))
258
259
self .groupBox_2 .setTitle (_translate ("mainWindow" , "GroupBox" ))
260
+ self .btnUrgence .setToolTip (_translate ("mainWindow" , "Dévérouiller l\' arrêt d\' urgence" ))
259
261
self .tabWidget .setTabText (self .tabWidget .indexOf (self .tab ), _translate ("mainWindow" , "Tab 1" ))
260
262
self .tabWidget .setTabText (self .tabWidget .indexOf (self .tab_2 ), _translate ("mainWindow" , "Tab 2" ))
261
- self .menu_Application .setTitle (_translate ("mainWindow" , "&Application" ))
262
- self .actionOuvrir_un_fichier_GCode .setText (_translate ("mainWindow" , "&Ouvrir un fichier GCode..." ))
263
- self .action_Quitter .setText (_translate ("mainWindow" , "&Quitter" ))
263
+ self .mnuApplication .setTitle (_translate ("mainWindow" , "&Application" ))
264
+ self .mnuAppOuvrir .setText (_translate ("mainWindow" , "&Ouvrir un fichier GCode..." ))
265
+ self .mnuAppQuitter .setText (_translate ("mainWindow" , "&Quitter" ))
264
266
0 commit comments