diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c1f9e15 --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +#Pyquino Makefile + +all: build run + +build: launchPyquino.py + pyinstaller -F $< -i ./icons/usb.ico \ +--path="C:\Users\Lin\AppData\Local\Programs\Python\Python35\Lib\site-packages\PyQt5\Qt\bin" \ +--add-binary="core/vrep_remoAPI/remoteApi.dll;." + +run: build dist\launchPyquino.exe + dist\launchPyquino.exe + +clean: + rd build /s /q + rd dist /s /q + del launchPyquino.spec diff --git a/Pyquino.e4p b/Pyquino.e4p index cbfa2c3..55e4073 100644 --- a/Pyquino.e4p +++ b/Pyquino.e4p @@ -1,7 +1,7 @@ - + en_US @@ -55,6 +55,7 @@ Arduino_test_file/README.md + Makefile launchPyquino.py diff --git a/__pycache__/icons_rc.cpython-35.pyc b/__pycache__/icons_rc.cpython-35.pyc index 02ccffc..ba37e86 100644 Binary files a/__pycache__/icons_rc.cpython-35.pyc and b/__pycache__/icons_rc.cpython-35.pyc differ diff --git a/__pycache__/pnael.cpython-35.pyc b/__pycache__/pnael.cpython-35.pyc index b033a83..9b0be54 100644 Binary files a/__pycache__/pnael.cpython-35.pyc and b/__pycache__/pnael.cpython-35.pyc differ diff --git a/_eric6project/Pyquino.e4q b/_eric6project/Pyquino.e4q new file mode 100644 index 0000000..8f2e90d --- /dev/null +++ b/_eric6project/Pyquino.e4q @@ -0,0 +1,6 @@ + + + + + + diff --git a/_eric6project/Pyquino.e6t b/_eric6project/Pyquino.e6t index fe675f8..e950973 100644 --- a/_eric6project/Pyquino.e6t +++ b/_eric6project/Pyquino.e6t @@ -1,16 +1,7 @@ - + - - TODO: not implemented yet - - 2017-02-26, 16:15:09 - - core/mainwindow.py - 425 - - diff --git a/build/launchPyquino/base_library.zip b/build/launchPyquino/base_library.zip index 2342afc..7270c5a 100644 Binary files a/build/launchPyquino/base_library.zip and b/build/launchPyquino/base_library.zip differ diff --git a/core/__pycache__/Ui_mainwindow.cpython-35.pyc b/core/__pycache__/Ui_mainwindow.cpython-35.pyc index d8453ca..11edc7f 100644 Binary files a/core/__pycache__/Ui_mainwindow.cpython-35.pyc and b/core/__pycache__/Ui_mainwindow.cpython-35.pyc differ diff --git a/core/__pycache__/__init__.cpython-35.pyc b/core/__pycache__/__init__.cpython-35.pyc index aca54db..a6a4eb6 100644 Binary files a/core/__pycache__/__init__.cpython-35.pyc and b/core/__pycache__/__init__.cpython-35.pyc differ diff --git a/core/__pycache__/info.cpython-35.pyc b/core/__pycache__/info.cpython-35.pyc index 2ad6a06..6fff8d8 100644 Binary files a/core/__pycache__/info.cpython-35.pyc and b/core/__pycache__/info.cpython-35.pyc differ diff --git a/core/__pycache__/mainwindow.cpython-35.pyc b/core/__pycache__/mainwindow.cpython-35.pyc index 833f826..9006fbc 100644 Binary files a/core/__pycache__/mainwindow.cpython-35.pyc and b/core/__pycache__/mainwindow.cpython-35.pyc differ diff --git a/core/__pycache__/serialportcontext.cpython-35.pyc b/core/__pycache__/serialportcontext.cpython-35.pyc index f77436a..c1f6418 100644 Binary files a/core/__pycache__/serialportcontext.cpython-35.pyc and b/core/__pycache__/serialportcontext.cpython-35.pyc differ diff --git a/core/gcode/__pycache__/gcodeParser.cpython-35.pyc b/core/gcode/__pycache__/gcodeParser.cpython-35.pyc index 492ad6e..f146aff 100644 Binary files a/core/gcode/__pycache__/gcodeParser.cpython-35.pyc and b/core/gcode/__pycache__/gcodeParser.cpython-35.pyc differ diff --git a/core/graphy/__pycache__/Ui_graphy.cpython-35.pyc b/core/graphy/__pycache__/Ui_graphy.cpython-35.pyc index e17ddd7..4f69c67 100644 Binary files a/core/graphy/__pycache__/Ui_graphy.cpython-35.pyc and b/core/graphy/__pycache__/Ui_graphy.cpython-35.pyc differ diff --git a/core/graphy/__pycache__/__init__.cpython-35.pyc b/core/graphy/__pycache__/__init__.cpython-35.pyc index 70316bb..e34a79b 100644 Binary files a/core/graphy/__pycache__/__init__.cpython-35.pyc and b/core/graphy/__pycache__/__init__.cpython-35.pyc differ diff --git a/core/graphy/__pycache__/graphy.cpython-35.pyc b/core/graphy/__pycache__/graphy.cpython-35.pyc index 415cc39..80ea63d 100644 Binary files a/core/graphy/__pycache__/graphy.cpython-35.pyc and b/core/graphy/__pycache__/graphy.cpython-35.pyc differ diff --git a/core/graphy/graphy.py b/core/graphy/graphy.py index bd59b98..05e4056 100644 --- a/core/graphy/graphy.py +++ b/core/graphy/graphy.py @@ -9,7 +9,6 @@ from .Ui_graphy import Ui_Dialog -import pyqtgraph as pg import pyqtgraph.opengl as gl diff --git a/core/mainwindow.py b/core/mainwindow.py index fc39e07..a51c723 100644 --- a/core/mainwindow.py +++ b/core/mainwindow.py @@ -12,7 +12,7 @@ from .Ui_mainwindow import Ui_MainWindow from .monitor.machine_mointor import Machine -from .graphy.graphy import Dialog +#from .graphy.graphy import Dialog import pnael from .vrep.vrep_setting import vrepsetting diff --git a/core/monitor/__pycache__/Ui_machine_mointor.cpython-35.pyc b/core/monitor/__pycache__/Ui_machine_mointor.cpython-35.pyc index 4e1d914..0f6946e 100644 Binary files a/core/monitor/__pycache__/Ui_machine_mointor.cpython-35.pyc and b/core/monitor/__pycache__/Ui_machine_mointor.cpython-35.pyc differ diff --git a/core/monitor/__pycache__/__init__.cpython-35.pyc b/core/monitor/__pycache__/__init__.cpython-35.pyc index b19e9e9..2aae5f0 100644 Binary files a/core/monitor/__pycache__/__init__.cpython-35.pyc and b/core/monitor/__pycache__/__init__.cpython-35.pyc differ diff --git a/core/monitor/__pycache__/machine_mointor.cpython-35.pyc b/core/monitor/__pycache__/machine_mointor.cpython-35.pyc index d8cf9d5..582472d 100644 Binary files a/core/monitor/__pycache__/machine_mointor.cpython-35.pyc and b/core/monitor/__pycache__/machine_mointor.cpython-35.pyc differ diff --git a/core/vrep/__pycache__/Ui_vrep_setting.cpython-35.pyc b/core/vrep/__pycache__/Ui_vrep_setting.cpython-35.pyc index b202938..b488d12 100644 Binary files a/core/vrep/__pycache__/Ui_vrep_setting.cpython-35.pyc and b/core/vrep/__pycache__/Ui_vrep_setting.cpython-35.pyc differ diff --git a/core/vrep/__pycache__/vrep_setting.cpython-35.pyc b/core/vrep/__pycache__/vrep_setting.cpython-35.pyc index 4fc48c6..c036f48 100644 Binary files a/core/vrep/__pycache__/vrep_setting.cpython-35.pyc and b/core/vrep/__pycache__/vrep_setting.cpython-35.pyc differ diff --git a/core/vrep/vrep_setting.py b/core/vrep/vrep_setting.py index 232accd..1cc1b7e 100644 --- a/core/vrep/vrep_setting.py +++ b/core/vrep/vrep_setting.py @@ -29,11 +29,12 @@ def run(self): self.getProgress.setMaximum(len([e for e in self.layers[0].segments])) self.layer_vertices = list() for layer in self.layers: + ''' x = layer.start["X"] y = layer.start["Y"] z = layer.start["Z"] + ''' for seg in layer.segments: - self.layer_vertices.append([x, y, z]) seg_x = seg.coords["X"] seg_y = seg.coords["Y"] seg_z = seg.coords["Z"] diff --git a/core/vrep_remoAPI/__pycache__/vrep.cpython-35.pyc b/core/vrep_remoAPI/__pycache__/vrep.cpython-35.pyc index 1d8da49..a97251e 100644 Binary files a/core/vrep_remoAPI/__pycache__/vrep.cpython-35.pyc and b/core/vrep_remoAPI/__pycache__/vrep.cpython-35.pyc differ diff --git a/core/vrep_remoAPI/__pycache__/vrepConst.cpython-35.pyc b/core/vrep_remoAPI/__pycache__/vrepConst.cpython-35.pyc index 706139c..c1a771a 100644 Binary files a/core/vrep_remoAPI/__pycache__/vrepConst.cpython-35.pyc and b/core/vrep_remoAPI/__pycache__/vrepConst.cpython-35.pyc differ diff --git a/icons/usb.ico b/icons/usb.ico new file mode 100644 index 0000000..2a02dcf Binary files /dev/null and b/icons/usb.ico differ diff --git a/launchPyquino.spec b/launchPyquino.spec index cd15c3e..72045df 100644 --- a/launchPyquino.spec +++ b/launchPyquino.spec @@ -4,8 +4,8 @@ block_cipher = None a = Analysis(['launchPyquino.py'], - pathex=['/home/kmol/桌面/Pyquino'], - binaries=[], + pathex=['C:\\Users\\Lin\\AppData\\Local\\Programs\\Python\\Python35\\Lib\\site-packages\\PyQt5\\Qt\\bin', 'C:\\Users\\Lin\\Desktop\\Pyquino'], + binaries=[('core/vrep_remoAPI/remoteApi.dll', '.')], datas=[], hiddenimports=[], hookspath=[], @@ -18,16 +18,11 @@ pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) exe = EXE(pyz, a.scripts, - exclude_binaries=True, + a.binaries, + a.zipfiles, + a.datas, name='launchPyquino', debug=False, strip=False, upx=True, - console=False ) -coll = COLLECT(exe, - a.binaries, - a.zipfiles, - a.datas, - strip=False, - upx=True, - name='launchPyquino') + console=True , icon='icons\\usb.ico')