From 6525877b8bd93861d043ce370e28f4c636034fb0 Mon Sep 17 00:00:00 2001 From: monclubelec Date: Sun, 5 Jul 2015 12:58:32 +0200 Subject: [PATCH 1/4] Update SimpleGCodeGUI.ui --- SimpleGCodeGUI.ui | 271 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 226 insertions(+), 45 deletions(-) diff --git a/SimpleGCodeGUI.ui b/SimpleGCodeGUI.ui index a4781c2..ba36331 100644 --- a/SimpleGCodeGUI.ui +++ b/SimpleGCodeGUI.ui @@ -6,12 +6,12 @@ 0 0 - 820 - 455 + 813 + 478 - Simple G-Code GUI v0.2 + Simple G-Code GUI v0.3 @@ -19,9 +19,9 @@ - 375 - 125 - 436 + 369 + 191 + 441 21 @@ -29,21 +29,30 @@ - 375 - 180 - 431 - 231 + 370 + 242 + 441 + 205 + + + DejaVu Sans + 8 + + QTextEdit::NoWrap + + false + - 375 - 155 + 369 + 216 86 21 @@ -55,8 +64,8 @@ - 465 - 155 + 459 + 216 85 21 @@ -68,8 +77,8 @@ - 555 - 155 + 549 + 216 86 21 @@ -81,12 +90,15 @@ - 650 - 155 + 640 + 217 136 21 + + background-color: rgb(255, 255, 0); + Envoyer GCode @@ -95,7 +107,7 @@ 370 - 110 + 178 436 16 @@ -184,14 +196,23 @@ 370 - 30 + 23 441 - 81 + 158 + + + DejaVu Sans + 7 + + background-color: rgb(244, 255, 190); + + false + @@ -317,10 +338,10 @@ - 357 - 5 + 358 + 12 16 - 441 + 461 @@ -331,11 +352,17 @@ 2 - 160 + 156 359 - 70 + 74 + + + DejaVu Sans + 7 + + color: rgb(0, 0, 255); background-color: rgb(170, 255, 255); @@ -343,6 +370,9 @@ background-color: rgb(170, 255, 255); QTextEdit::NoWrap + + false + @@ -373,8 +403,8 @@ background-color: rgb(170, 255, 255); - 380 - 10 + 371 + 6 171 16 @@ -438,8 +468,8 @@ background-color: rgb(170, 255, 255); - 380 - 420 + 375 + 449 61 27 @@ -451,8 +481,8 @@ background-color: rgb(170, 255, 255); - 450 - 420 + 440 + 450 61 27 @@ -496,8 +526,8 @@ background-color: rgb(170, 255, 255); - 18 - 273 + 7 + 248 65 27 @@ -512,8 +542,8 @@ background-color: rgb(170, 255, 255); - 161 - 273 + 163 + 247 65 27 @@ -547,8 +577,8 @@ background-color: rgb(170, 255, 255); - 292 - 334 + 293 + 335 65 27 @@ -650,8 +680,8 @@ background-color: rgb(170, 255, 255); - 105 - 300 + 103 + 370 41 27 @@ -667,7 +697,7 @@ background-color: rgb(170, 255, 255); 105 - 410 + 259 41 27 @@ -682,8 +712,8 @@ background-color: rgb(170, 255, 255); - 105 - 370 + 103 + 295 41 27 @@ -698,8 +728,8 @@ background-color: rgb(170, 255, 255); - 105 - 260 + 104 + 408 41 27 @@ -829,6 +859,149 @@ background-color: rgb(170, 255, 255); +10 + + + + 294 + 309 + 64 + 16 + + + + background-color: rgba(0, 160, 255, 255); + + + Goto Z0 + + + + + + 8 + 282 + 64 + 16 + + + + background-color: rgba(255, 0, 0, 127); + + + Goto X0 + + + + + + 165 + 283 + 64 + 16 + + + + background-color: rgba(0, 255, 0, 127); + + + Goto Y0 + + + + + + 8 + 410 + 65 + 27 + + + + background-color: rgba(255, 127, 0, 255); + + + RAZ X + + + + + + 162 + 411 + 65 + 27 + + + + background-color: rgba(127, 255, 0, 255); + + + RAZ Y + + + + + + 58 + 461 + 256 + 16 + + + + 1 + + + 8 + + + 1 + + + Qt::Horizontal + + + false + + + false + + + QSlider::TicksAbove + + + 1 + + + + + + 0 + 459 + 62 + 15 + + + + Speed : + + + + + + 320 + 459 + 39 + 16 + + + + + + + Set + + label lineEditChemin textEdit @@ -879,6 +1052,14 @@ background-color: rgb(170, 255, 255); pushButton_Z_MOINS_UN pushButton_Z_PLUS_ZERO_UN pushButton_Z_PLUS_DIX + pushButton_Z_GOTO_ZERO + pushButton_X_GOTO_ZERO + pushButton_Y_GOTO_ZERO + pushButton_RAZ_X + pushButton_RAZ_Y + horizontalSlider_SET_SPEED + label_SPEED + pushButton_SET_SPEED From 4375082840c0d8da2c37c1051d892fe47f2aa718 Mon Sep 17 00:00:00 2001 From: monclubelec Date: Sun, 5 Jul 2015 12:59:24 +0200 Subject: [PATCH 2/4] Update SimpleGCodeGUIMain.py --- SimpleGCodeGUIMain.py | 91 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/SimpleGCodeGUIMain.py b/SimpleGCodeGUIMain.py index c229480..9986157 100644 --- a/SimpleGCodeGUIMain.py +++ b/SimpleGCodeGUIMain.py @@ -42,6 +42,8 @@ def __init__(self, parent=None): self.connect(self.pushButton_X_MOINS_UN, SIGNAL("clicked()"), self.pushButton_X_MOINS_UN_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue self.connect(self.pushButton_X_MOINS_DIX, SIGNAL("clicked()"), self.pushButton_X_MOINS_DIX_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue self.connect(self.pushButton_HOME_X, SIGNAL("clicked()"), self.pushButton_HOME_X_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue + self.connect(self.pushButton_RAZ_X, SIGNAL("clicked()"), self.pushButton_RAZ_X_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue + self.connect(self.pushButton_X_GOTO_ZERO, SIGNAL("clicked()"), self.pushButton_X_GOTO_ZERO_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue # -- Y self.connect(self.pushButton_Y_PLUS_UN, SIGNAL("clicked()"), self.pushButton_Y_PLUS_UN_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue @@ -49,6 +51,8 @@ def __init__(self, parent=None): self.connect(self.pushButton_Y_MOINS_UN, SIGNAL("clicked()"), self.pushButton_Y_MOINS_UN_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue self.connect(self.pushButton_Y_MOINS_DIX, SIGNAL("clicked()"), self.pushButton_Y_MOINS_DIX_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue self.connect(self.pushButton_HOME_Y, SIGNAL("clicked()"), self.pushButton_HOME_Y_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue + self.connect(self.pushButton_RAZ_Y, SIGNAL("clicked()"), self.pushButton_RAZ_Y_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue + self.connect(self.pushButton_Y_GOTO_ZERO, SIGNAL("clicked()"), self.pushButton_Y_GOTO_ZERO_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue # -- Z self.connect(self.pushButton_Z_PLUS_ZERO_UN, SIGNAL("clicked()"), self.pushButton_Z_PLUS_ZERO_UN_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue @@ -59,8 +63,14 @@ def __init__(self, parent=None): self.connect(self.pushButton_Z_MOINS_DIX, SIGNAL("clicked()"), self.pushButton_Z_MOINS_DIX_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue self.connect(self.pushButton_HOME_Z, SIGNAL("clicked()"), self.pushButton_HOME_Z_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue self.connect(self.pushButton_RAZ_Z, SIGNAL("clicked()"), self.pushButton_RAZ_Z_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue + self.connect(self.pushButton_Z_GOTO_ZERO, SIGNAL("clicked()"), self.pushButton_Z_GOTO_ZERO_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue + # -- Speed - slider et pushbutton + self.connect(self.horizontalSlider_SET_SPEED, SIGNAL("valueChanged(int)"), self.horizontalSlider_SET_SPEED_ValueChanged) + self.connect(self.horizontalSlider_SET_SPEED, SIGNAL("sliderReleased()"), self.horizontalSlider_SET_SPEED_Released) + self.connect(self.pushButton_SET_SPEED, SIGNAL("clicked()"), self.pushButton_SET_SPEED_Clicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue + # port série self.connect(self.pushButtonInitSerial, SIGNAL("clicked()"), self.pushButtonInitSerialClicked) self.connect(self.pushButtonEnvoi, SIGNAL("clicked()"), self.pushButtonEnvoiClicked) @@ -254,6 +264,7 @@ def pushButton_Z_MOINS_DIX_Clicked(self): # lors appui bouton initialisation sé self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses + #-- home Z def pushButton_HOME_Z_Clicked(self): # lors appui bouton initialisation série print("Bouton HOME Z cliqué") @@ -263,11 +274,90 @@ def pushButton_HOME_Z_Clicked(self): # lors appui bouton initialisation série self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses + #-- RAZ X + def pushButton_RAZ_X_Clicked(self): # lors appui bouton initialisation série + print("Bouton RAZ X cliqué") + + gcode=( +"""G92 X0 +""") + + self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses + + #-- RAZ X + def pushButton_RAZ_Y_Clicked(self): # lors appui bouton initialisation série + print("Bouton RAZ Y cliqué") + + gcode=( +"""G92 Y0 +""") + + self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses + + #-- RAZ Z def pushButton_RAZ_Z_Clicked(self): # lors appui bouton initialisation série print("Bouton RAZ Z cliqué") gcode=( """G92 Z0 +""") + + self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses + + #-- GOTO ZERO X + def pushButton_X_GOTO_ZERO_Clicked(self): # lors appui bouton initialisation série + print("Bouton GOTO XO cliqué") + + gcode=( +"""G01 X0 +""") + + self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses + + #-- GOTO ZERO Y + def pushButton_Y_GOTO_ZERO_Clicked(self): # lors appui bouton initialisation série + print("Bouton GOTO Y0 cliqué") + + gcode=( +"""G01 Y0 +""") + + self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses + + #-- GOTO ZERO Z + def pushButton_Z_GOTO_ZERO_Clicked(self): # lors appui bouton + print("Bouton GOTO Z0 cliqué") + + gcode=( +"""G01 Z0 +""") + + self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses + + #-- Slider SET SPEED + def horizontalSlider_SET_SPEED_ValueChanged(self, valeur): # fonction appelée si changement valeur slider - reçoit la valeur courante + print("Slider modifié : valeur = " + str(valeur)) + + def horizontalSlider_SET_SPEED_Released(self): # fonction appelée si changement souris relâchée + print("Slider : clic souris relaché") + print("Valeur = " + str(self.horizontalSlider_SET_SPEED.value())) + + speed=self.horizontalSlider_SET_SPEED.value() # récupère valeur courante slider + + gcode=( +"""G01 F"""+str(speed)+""" +""") + + self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses + + #-- pushbutton SET SPEED + def pushButton_SET_SPEED_Clicked(self): # lors appui bouton + print("Bouton SET SPEED cliqué") + + speed=self.horizontalSlider_SET_SPEED.value() # récupère valeur courante slider + + gcode=( +"""G01 F"""+str(speed)+""" """) self.envoiGCode(gcode) # envoie le GCode vers machine avec attente des réponses @@ -930,4 +1020,3 @@ def main(args): - From d828d0ed2232f2f29bddeed44aeb9913c2d46202 Mon Sep 17 00:00:00 2001 From: monclubelec Date: Wed, 8 Jul 2015 15:09:52 +0200 Subject: [PATCH 3/4] Update SimpleGCodeGUIMain.py --- SimpleGCodeGUIMain.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SimpleGCodeGUIMain.py b/SimpleGCodeGUIMain.py index 9986157..d339b07 100644 --- a/SimpleGCodeGUIMain.py +++ b/SimpleGCodeGUIMain.py @@ -76,6 +76,9 @@ def __init__(self, parent=None): self.connect(self.pushButtonEnvoi, SIGNAL("clicked()"), self.pushButtonEnvoiClicked) self.connect(self.pushButtonStop, SIGNAL("clicked()"), self.pushButtonStopClicked) + # - pour envoi sur appui return dans lineEdit + self.connect(self.lineEditChaineEnvoi, SIGNAL("returnPressed()"), self.pushButtonEnvoiClicked) # connecte le signal Clicked de l'objet bouton à l'appel de la fonction voulue + #initialisation Timer self.timerSerial=QTimer() # déclare un timer Qt self.connect(self.timerSerial, SIGNAL("timeout()"), self.timerSerialEvent) # connecte le signal timeOut de l'objet timer à l'appel de la fonction voulue From 4820fa199e2cfe5b59718ae7da46dcb6d95b8b25 Mon Sep 17 00:00:00 2001 From: monclubelec Date: Wed, 8 Jul 2015 15:16:37 +0200 Subject: [PATCH 4/4] Update SimpleGCodeGUI.py --- SimpleGCodeGUI.py | 107 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 84 insertions(+), 23 deletions(-) diff --git a/SimpleGCodeGUI.py b/SimpleGCodeGUI.py index b231662..9dccb02 100644 --- a/SimpleGCodeGUI.py +++ b/SimpleGCodeGUI.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file +# Form implementation generated from reading ui file 'SimpleGCodeGUI.ui' # # Created by: PyQt4 UI code generator 4.11.3 # @@ -25,29 +25,35 @@ def _translate(context, text, disambig): class Ui_Form(object): def setupUi(self, Form): Form.setObjectName(_fromUtf8("Form")) - Form.resize(820, 455) + Form.resize(813, 478) Form.setStyleSheet(_fromUtf8("")) self.lineEditChemin = QtGui.QLineEdit(Form) - self.lineEditChemin.setGeometry(QtCore.QRect(375, 125, 436, 21)) + self.lineEditChemin.setGeometry(QtCore.QRect(369, 191, 441, 21)) self.lineEditChemin.setObjectName(_fromUtf8("lineEditChemin")) self.textEdit = QtGui.QTextEdit(Form) - self.textEdit.setGeometry(QtCore.QRect(375, 180, 431, 231)) + self.textEdit.setGeometry(QtCore.QRect(370, 242, 441, 205)) + font = QtGui.QFont() + font.setFamily(_fromUtf8("DejaVu Sans")) + font.setPointSize(8) + self.textEdit.setFont(font) self.textEdit.setLineWrapMode(QtGui.QTextEdit.NoWrap) + self.textEdit.setAcceptRichText(False) self.textEdit.setObjectName(_fromUtf8("textEdit")) self.pushButtonNouveau = QtGui.QPushButton(Form) - self.pushButtonNouveau.setGeometry(QtCore.QRect(375, 155, 86, 21)) + self.pushButtonNouveau.setGeometry(QtCore.QRect(369, 216, 86, 21)) self.pushButtonNouveau.setObjectName(_fromUtf8("pushButtonNouveau")) self.pushButtonOuvrir = QtGui.QPushButton(Form) - self.pushButtonOuvrir.setGeometry(QtCore.QRect(465, 155, 85, 21)) + self.pushButtonOuvrir.setGeometry(QtCore.QRect(459, 216, 85, 21)) self.pushButtonOuvrir.setObjectName(_fromUtf8("pushButtonOuvrir")) self.pushButtonEnregistrer = QtGui.QPushButton(Form) - self.pushButtonEnregistrer.setGeometry(QtCore.QRect(555, 155, 86, 21)) + self.pushButtonEnregistrer.setGeometry(QtCore.QRect(549, 216, 86, 21)) self.pushButtonEnregistrer.setObjectName(_fromUtf8("pushButtonEnregistrer")) self.pushButtonEnvoiGCode = QtGui.QPushButton(Form) - self.pushButtonEnvoiGCode.setGeometry(QtCore.QRect(650, 155, 136, 21)) + self.pushButtonEnvoiGCode.setGeometry(QtCore.QRect(640, 217, 136, 21)) + self.pushButtonEnvoiGCode.setStyleSheet(_fromUtf8("background-color: rgb(255, 255, 0);")) self.pushButtonEnvoiGCode.setObjectName(_fromUtf8("pushButtonEnvoiGCode")) self.line_5 = QtGui.QFrame(Form) - self.line_5.setGeometry(QtCore.QRect(370, 110, 436, 16)) + self.line_5.setGeometry(QtCore.QRect(370, 178, 436, 16)) self.line_5.setFrameShape(QtGui.QFrame.HLine) self.line_5.setFrameShadow(QtGui.QFrame.Sunken) self.line_5.setObjectName(_fromUtf8("line_5")) @@ -69,8 +75,13 @@ def setupUi(self, Form): self.comboBoxDebit.addItem(_fromUtf8("")) self.comboBoxDebit.addItem(_fromUtf8("")) self.textEditReception = QtGui.QTextEdit(Form) - self.textEditReception.setGeometry(QtCore.QRect(370, 30, 441, 81)) + self.textEditReception.setGeometry(QtCore.QRect(370, 23, 441, 158)) + font = QtGui.QFont() + font.setFamily(_fromUtf8("DejaVu Sans")) + font.setPointSize(7) + self.textEditReception.setFont(font) self.textEditReception.setStyleSheet(_fromUtf8("background-color: rgb(244, 255, 190);")) + self.textEditReception.setAcceptRichText(False) self.textEditReception.setObjectName(_fromUtf8("textEditReception")) self.line_2 = QtGui.QFrame(Form) self.line_2.setGeometry(QtCore.QRect(10, 130, 348, 16)) @@ -104,15 +115,20 @@ def setupUi(self, Form): self.labelDebit.setGeometry(QtCore.QRect(140, 10, 131, 16)) self.labelDebit.setObjectName(_fromUtf8("labelDebit")) self.line_3 = QtGui.QFrame(Form) - self.line_3.setGeometry(QtCore.QRect(357, 5, 16, 441)) + self.line_3.setGeometry(QtCore.QRect(358, 12, 16, 461)) self.line_3.setFrameShape(QtGui.QFrame.VLine) self.line_3.setFrameShadow(QtGui.QFrame.Sunken) self.line_3.setObjectName(_fromUtf8("line_3")) self.textEditTraceEnvoiSerie = QtGui.QTextEdit(Form) - self.textEditTraceEnvoiSerie.setGeometry(QtCore.QRect(2, 160, 359, 70)) + self.textEditTraceEnvoiSerie.setGeometry(QtCore.QRect(2, 156, 359, 74)) + font = QtGui.QFont() + font.setFamily(_fromUtf8("DejaVu Sans")) + font.setPointSize(7) + self.textEditTraceEnvoiSerie.setFont(font) self.textEditTraceEnvoiSerie.setStyleSheet(_fromUtf8("color: rgb(0, 0, 255);\n" "background-color: rgb(170, 255, 255);")) self.textEditTraceEnvoiSerie.setLineWrapMode(QtGui.QTextEdit.NoWrap) + self.textEditTraceEnvoiSerie.setAcceptRichText(False) self.textEditTraceEnvoiSerie.setObjectName(_fromUtf8("textEditTraceEnvoiSerie")) self.pushButtonInitSerial = QtGui.QPushButton(Form) self.pushButtonInitSerial.setGeometry(QtCore.QRect(270, 10, 41, 41)) @@ -121,7 +137,7 @@ def setupUi(self, Form): self.labelChaineEnvoi.setGeometry(QtCore.QRect(10, 95, 121, 16)) self.labelChaineEnvoi.setObjectName(_fromUtf8("labelChaineEnvoi")) self.labelReception = QtGui.QLabel(Form) - self.labelReception.setGeometry(QtCore.QRect(380, 10, 171, 16)) + self.labelReception.setGeometry(QtCore.QRect(371, 6, 171, 16)) self.labelReception.setObjectName(_fromUtf8("labelReception")) self.labelDelaiRecept = QtGui.QLabel(Form) self.labelDelaiRecept.setGeometry(QtCore.QRect(10, 50, 121, 16)) @@ -137,10 +153,10 @@ def setupUi(self, Form): self.labelPort.setGeometry(QtCore.QRect(10, 10, 101, 16)) self.labelPort.setObjectName(_fromUtf8("labelPort")) self.pushButtonPassGCode = QtGui.QPushButton(Form) - self.pushButtonPassGCode.setGeometry(QtCore.QRect(380, 420, 61, 27)) + self.pushButtonPassGCode.setGeometry(QtCore.QRect(375, 449, 61, 27)) self.pushButtonPassGCode.setObjectName(_fromUtf8("pushButtonPassGCode")) self.pushButtonStopGCode = QtGui.QPushButton(Form) - self.pushButtonStopGCode.setGeometry(QtCore.QRect(450, 420, 61, 27)) + self.pushButtonStopGCode.setGeometry(QtCore.QRect(440, 450, 61, 27)) self.pushButtonStopGCode.setObjectName(_fromUtf8("pushButtonStopGCode")) self.label = QtGui.QLabel(Form) self.label.setGeometry(QtCore.QRect(3, 234, 358, 217)) @@ -154,11 +170,11 @@ def setupUi(self, Form): self.line_8.setFrameShadow(QtGui.QFrame.Sunken) self.line_8.setObjectName(_fromUtf8("line_8")) self.pushButton_HOME_X = QtGui.QPushButton(Form) - self.pushButton_HOME_X.setGeometry(QtCore.QRect(18, 273, 65, 27)) + self.pushButton_HOME_X.setGeometry(QtCore.QRect(7, 248, 65, 27)) self.pushButton_HOME_X.setStyleSheet(_fromUtf8("background-color: rgba(255, 0, 0, 127);")) self.pushButton_HOME_X.setObjectName(_fromUtf8("pushButton_HOME_X")) self.pushButton_HOME_Y = QtGui.QPushButton(Form) - self.pushButton_HOME_Y.setGeometry(QtCore.QRect(161, 273, 65, 27)) + self.pushButton_HOME_Y.setGeometry(QtCore.QRect(163, 247, 65, 27)) self.pushButton_HOME_Y.setStyleSheet(_fromUtf8("background-color: rgba(0, 255, 0, 127);")) self.pushButton_HOME_Y.setObjectName(_fromUtf8("pushButton_HOME_Y")) self.pushButton_HOME_Z = QtGui.QPushButton(Form) @@ -167,7 +183,7 @@ def setupUi(self, Form): self.pushButton_HOME_Z.setStyleSheet(_fromUtf8("background-color: rgba(0, 160, 255, 255);")) self.pushButton_HOME_Z.setObjectName(_fromUtf8("pushButton_HOME_Z")) self.pushButton_RAZ_Z = QtGui.QPushButton(Form) - self.pushButton_RAZ_Z.setGeometry(QtCore.QRect(292, 334, 65, 27)) + self.pushButton_RAZ_Z.setGeometry(QtCore.QRect(293, 335, 65, 27)) self.pushButton_RAZ_Z.setStyleSheet(_fromUtf8("background-color: rgba(0, 255, 255, 255);")) self.pushButton_RAZ_Z.setObjectName(_fromUtf8("pushButton_RAZ_Z")) self.pushButton_X_PLUS_UN = QtGui.QPushButton(Form) @@ -196,19 +212,19 @@ def setupUi(self, Form): self.line_6.setFrameShadow(QtGui.QFrame.Sunken) self.line_6.setObjectName(_fromUtf8("line_6")) self.pushButton_Y_PLUS_UN = QtGui.QPushButton(Form) - self.pushButton_Y_PLUS_UN.setGeometry(QtCore.QRect(105, 300, 41, 27)) + self.pushButton_Y_PLUS_UN.setGeometry(QtCore.QRect(103, 370, 41, 27)) self.pushButton_Y_PLUS_UN.setStyleSheet(_fromUtf8("background-color: rgba(0, 255, 0, 200);")) self.pushButton_Y_PLUS_UN.setObjectName(_fromUtf8("pushButton_Y_PLUS_UN")) self.pushButton_Y_MOINS_DIX = QtGui.QPushButton(Form) - self.pushButton_Y_MOINS_DIX.setGeometry(QtCore.QRect(105, 410, 41, 27)) + self.pushButton_Y_MOINS_DIX.setGeometry(QtCore.QRect(105, 259, 41, 27)) self.pushButton_Y_MOINS_DIX.setStyleSheet(_fromUtf8("background-color: rgba(0, 255, 0, 200);")) self.pushButton_Y_MOINS_DIX.setObjectName(_fromUtf8("pushButton_Y_MOINS_DIX")) self.pushButton_Y_MOINS_UN = QtGui.QPushButton(Form) - self.pushButton_Y_MOINS_UN.setGeometry(QtCore.QRect(105, 370, 41, 27)) + self.pushButton_Y_MOINS_UN.setGeometry(QtCore.QRect(103, 295, 41, 27)) self.pushButton_Y_MOINS_UN.setStyleSheet(_fromUtf8("background-color: rgba(0, 255, 0, 200);")) self.pushButton_Y_MOINS_UN.setObjectName(_fromUtf8("pushButton_Y_MOINS_UN")) self.pushButton_Y_PLUS_DIX = QtGui.QPushButton(Form) - self.pushButton_Y_PLUS_DIX.setGeometry(QtCore.QRect(105, 260, 41, 27)) + self.pushButton_Y_PLUS_DIX.setGeometry(QtCore.QRect(104, 408, 41, 27)) self.pushButton_Y_PLUS_DIX.setStyleSheet(_fromUtf8("background-color: rgba(0, 255, 0, 200);")) self.pushButton_Y_PLUS_DIX.setObjectName(_fromUtf8("pushButton_Y_PLUS_DIX")) self.line_7 = QtGui.QFrame(Form) @@ -243,13 +259,51 @@ def setupUi(self, Form): self.pushButton_Z_PLUS_DIX.setGeometry(QtCore.QRect(244, 247, 41, 27)) self.pushButton_Z_PLUS_DIX.setStyleSheet(_fromUtf8("background-color: rgba(0, 160, 255, 255);")) self.pushButton_Z_PLUS_DIX.setObjectName(_fromUtf8("pushButton_Z_PLUS_DIX")) + self.pushButton_Z_GOTO_ZERO = QtGui.QPushButton(Form) + self.pushButton_Z_GOTO_ZERO.setGeometry(QtCore.QRect(294, 309, 64, 16)) + self.pushButton_Z_GOTO_ZERO.setStyleSheet(_fromUtf8("background-color: rgba(0, 160, 255, 255);")) + self.pushButton_Z_GOTO_ZERO.setObjectName(_fromUtf8("pushButton_Z_GOTO_ZERO")) + self.pushButton_X_GOTO_ZERO = QtGui.QPushButton(Form) + self.pushButton_X_GOTO_ZERO.setGeometry(QtCore.QRect(8, 282, 64, 16)) + self.pushButton_X_GOTO_ZERO.setStyleSheet(_fromUtf8("background-color: rgba(255, 0, 0, 127);")) + self.pushButton_X_GOTO_ZERO.setObjectName(_fromUtf8("pushButton_X_GOTO_ZERO")) + self.pushButton_Y_GOTO_ZERO = QtGui.QPushButton(Form) + self.pushButton_Y_GOTO_ZERO.setGeometry(QtCore.QRect(165, 283, 64, 16)) + self.pushButton_Y_GOTO_ZERO.setStyleSheet(_fromUtf8("background-color: rgba(0, 255, 0, 127);")) + self.pushButton_Y_GOTO_ZERO.setObjectName(_fromUtf8("pushButton_Y_GOTO_ZERO")) + self.pushButton_RAZ_X = QtGui.QPushButton(Form) + self.pushButton_RAZ_X.setGeometry(QtCore.QRect(8, 410, 65, 27)) + self.pushButton_RAZ_X.setStyleSheet(_fromUtf8("background-color: rgba(255, 127, 0, 255);")) + self.pushButton_RAZ_X.setObjectName(_fromUtf8("pushButton_RAZ_X")) + self.pushButton_RAZ_Y = QtGui.QPushButton(Form) + self.pushButton_RAZ_Y.setGeometry(QtCore.QRect(162, 411, 65, 27)) + self.pushButton_RAZ_Y.setStyleSheet(_fromUtf8("background-color: rgba(127, 255, 0, 255);")) + self.pushButton_RAZ_Y.setObjectName(_fromUtf8("pushButton_RAZ_Y")) + self.horizontalSlider_SET_SPEED = QtGui.QSlider(Form) + self.horizontalSlider_SET_SPEED.setGeometry(QtCore.QRect(58, 461, 256, 16)) + self.horizontalSlider_SET_SPEED.setMinimum(1) + self.horizontalSlider_SET_SPEED.setMaximum(8) + self.horizontalSlider_SET_SPEED.setPageStep(1) + self.horizontalSlider_SET_SPEED.setOrientation(QtCore.Qt.Horizontal) + self.horizontalSlider_SET_SPEED.setInvertedAppearance(False) + self.horizontalSlider_SET_SPEED.setInvertedControls(False) + self.horizontalSlider_SET_SPEED.setTickPosition(QtGui.QSlider.TicksAbove) + self.horizontalSlider_SET_SPEED.setTickInterval(1) + self.horizontalSlider_SET_SPEED.setObjectName(_fromUtf8("horizontalSlider_SET_SPEED")) + self.label_SPEED = QtGui.QLabel(Form) + self.label_SPEED.setGeometry(QtCore.QRect(0, 459, 62, 15)) + self.label_SPEED.setObjectName(_fromUtf8("label_SPEED")) + self.pushButton_SET_SPEED = QtGui.QPushButton(Form) + self.pushButton_SET_SPEED.setGeometry(QtCore.QRect(320, 459, 39, 16)) + self.pushButton_SET_SPEED.setStyleSheet(_fromUtf8("")) + self.pushButton_SET_SPEED.setObjectName(_fromUtf8("pushButton_SET_SPEED")) self.retranslateUi(Form) self.comboBoxFinLigne.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(Form) def retranslateUi(self, Form): - Form.setWindowTitle(_translate("Form", "Simple G-Code GUI v0.2", None)) + Form.setWindowTitle(_translate("Form", "Simple G-Code GUI v0.3", None)) self.pushButtonNouveau.setText(_translate("Form", "Nouveau", None)) self.pushButtonOuvrir.setText(_translate("Form", "Ouvrir", None)) self.pushButtonEnregistrer.setText(_translate("Form", "Enregistrer", None)) @@ -300,6 +354,13 @@ def retranslateUi(self, Form): self.pushButton_Z_MOINS_UN.setText(_translate("Form", "-1", None)) self.pushButton_Z_PLUS_ZERO_UN.setText(_translate("Form", "+0.1", None)) self.pushButton_Z_PLUS_DIX.setText(_translate("Form", "+10", None)) + self.pushButton_Z_GOTO_ZERO.setText(_translate("Form", "Goto Z0", None)) + self.pushButton_X_GOTO_ZERO.setText(_translate("Form", "Goto X0 ", None)) + self.pushButton_Y_GOTO_ZERO.setText(_translate("Form", "Goto Y0", None)) + self.pushButton_RAZ_X.setText(_translate("Form", "RAZ X", None)) + self.pushButton_RAZ_Y.setText(_translate("Form", "RAZ Y", None)) + self.label_SPEED.setText(_translate("Form", "Speed :", None)) + self.pushButton_SET_SPEED.setText(_translate("Form", "Set", None)) if __name__ == "__main__":