Skip to content

cleanflight #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cafai wants to merge 4 commits into
base: master
Choose a base branch
from
Open

cleanflight #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70164bc
Update README.md
sensor56 Jan 29, 2016
81da9bc
Update SimpleGCodeGUI.py
sensor56 Jan 29, 2016
c0150ac
Update SimpleGCodeGUI.ui
sensor56 Jan 29, 2016
8b0a25c
Update SimpleGCodeGUIMain.py
sensor56 Jan 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Simple-GCode-GUI
Interface PyQt de contrôle d'une machine 3 axes programmée avec [Simple G-Code Decoder](https://github.com/sensor56/Simple-GCode-Decoder). Ecrit par X. HINAULT (http://www.mon-club-elec.fr). Licence GPLv3.
# Simple-GCode-GUI pour Windows
Version pour Windows de l'interface PyQt de contrôle d'une machine 3 axes programmée avec [Simple G-Code Decoder](https://github.com/sensor56/Simple-GCode-Decoder). Ecrit par X. HINAULT (http://www.mon-club-elec.fr). Licence GPLv3.



22 changes: 17 additions & 5 deletions SimpleGCodeGUI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ def setupUi(self, Form):
self.comboBoxPort.addItem(_fromUtf8(""))
self.comboBoxPort.addItem(_fromUtf8(""))
self.comboBoxPort.addItem(_fromUtf8(""))
self.comboBoxPort.addItem(_fromUtf8(""))
self.comboBoxPort.addItem(_fromUtf8(""))
self.comboBoxPort.addItem(_fromUtf8(""))
self.comboBoxPort.addItem(_fromUtf8(""))
self.comboBoxPort.addItem(_fromUtf8(""))
self.comboBoxPort.addItem(_fromUtf8(""))
self.labelDebit = QtGui.QLabel(Form)
self.labelDebit.setGeometry(QtCore.QRect(140, 10, 131, 16))
self.labelDebit.setObjectName(_fromUtf8("labelDebit"))
Expand Down Expand Up @@ -303,7 +309,7 @@ def setupUi(self, Form):
QtCore.QMetaObject.connectSlotsByName(Form)

def retranslateUi(self, Form):
Form.setWindowTitle(_translate("Form", "Simple G-Code GUI v0.3", None))
Form.setWindowTitle(_translate("Form", "Simple G-Code GUI v0.3 Windows version", None))
self.pushButtonNouveau.setText(_translate("Form", "Nouveau", None))
self.pushButtonOuvrir.setText(_translate("Form", "Ouvrir", None))
self.pushButtonEnregistrer.setText(_translate("Form", "Enregistrer", None))
Expand All @@ -323,10 +329,16 @@ def retranslateUi(self, Form):
self.comboBoxFinLigne.setItemText(2, _translate("Form", "Retour Chariot (\\r = CR)", None))
self.comboBoxFinLigne.setItemText(3, _translate("Form", "Les 2 (LF + CR)", None))
self.pushButtonEnvoi.setText(_translate("Form", "Envoi", None))
self.comboBoxPort.setItemText(0, _translate("Form", "/dev/ttyACM0", None))
self.comboBoxPort.setItemText(1, _translate("Form", "/dev/ttyACM1", None))
self.comboBoxPort.setItemText(2, _translate("Form", "/dev/ttyUSB0", None))
self.comboBoxPort.setItemText(3, _translate("Form", "/dev/ttyUSB1", None))
self.comboBoxPort.setItemText(0, _translate("Form", "COM1", None))
self.comboBoxPort.setItemText(1, _translate("Form", "COM2", None))
self.comboBoxPort.setItemText(2, _translate("Form", "COM3", None))
self.comboBoxPort.setItemText(3, _translate("Form", "COM4", None))
self.comboBoxPort.setItemText(4, _translate("Form", "COM5", None))
self.comboBoxPort.setItemText(5, _translate("Form", "COM6", None))
self.comboBoxPort.setItemText(6, _translate("Form", "COM7", None))
self.comboBoxPort.setItemText(7, _translate("Form", "COM8", None))
self.comboBoxPort.setItemText(8, _translate("Form", "COM9", None))
self.comboBoxPort.setItemText(9, _translate("Form", "COM10", None))
self.labelDebit.setText(_translate("Form", "Débit Série (bauds) :", None))
self.pushButtonInitSerial.setText(_translate("Form", "Init", None))
self.labelChaineEnvoi.setText(_translate("Form", "Chaîne à envoyer :", None))
Expand Down
38 changes: 34 additions & 4 deletions SimpleGCodeGUI.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,22 +303,52 @@
</property>
<item>
<property name="text">
<string>/dev/ttyACM0</string>
<string>COM1</string>
</property>
</item>
<item>
<property name="text">
<string>/dev/ttyACM1</string>
<string>COM2</string>
</property>
</item>
<item>
<property name="text">
<string>/dev/ttyUSB0</string>
<string>COM3</string>
</property>
</item>
<item>
<property name="text">
<string>/dev/ttyUSB1</string>
<string>COM4</string>
</property>
</item>
<item>
<property name="text">
<string>COM5</string>
</property>
</item>
<item>
<property name="text">
<string>COM6</string>
</property>
</item>
<item>
<property name="text">
<string>COM7</string>
</property>
</item>
<item>
<property name="text">
<string>COM8</string>
</property>
</item>
<item>
<property name="text">
<string>COM9</string>
</property>
</item>
<item>
<property name="text">
<string>COM10</string>
</property>
</item>
</widget>
Expand Down
9 changes: 6 additions & 3 deletions SimpleGCodeGUIMain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
# par X. HINAULT - Déc 2012 - Avril 2015- Tous droits réservés
# GPLv3 - www.mon-club-elec.fr

# modules a importer
# modules a importer
#sys.path.append(os.path.join('C:', 'Python27', 'Lib', 'site-packages', 'PyQt4'))
#sys.path.append('C:\\python27\\Lib\\site-packages\\PyQt4')
import sys
sys.path.append('C:\\python27\\Lib\\site-packages\\PyQt4')
from PyQt4.QtGui import *
from PyQt4.QtCore import * # inclut QTimer..

Expand Down Expand Up @@ -719,8 +723,7 @@ def pushButtonOuvrirClicked(self):

# ouvre fichier en tenant compte du chemin déjà saisi dans le champ
if self.lineEditChemin.text()=="":
self.filename=QFileDialog.getOpenFileName(self, 'Ouvrir fichier', os.getenv('HOME')) # ouvre l'interface fichier - home par défaut
#self.filename=QFileDialog.getOpenFileName(self, 'Ouvrir fichier', QDir.currentPath()) # ouvre l'interface fichier - chemin courant par défaut
self.filename=QFileDialog.getOpenFileName(self, 'Ouvrir fichier', os.getenv('PATH')) # ouvre l'interface fichier - chemin courant par défaut
else:
info=QFileInfo(self.lineEditChemin.text()) # définit un objet pour manipuler info sur fichier à partir chaine champ
print info.absoluteFilePath() # debug
Expand Down