release serial branch

.gitignore

@@ -1,5 +1,7 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
+_eric6project/
+.eric6project/
 *.py[cod]
 *$py.class
 

Makefile

@@ -1,11 +1,10 @@
 #Pyquino Makefile
 
-all: build run
+all: build
 
 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;."
+	$(eval PYQTPATH = $(shell python -c "import PyQt5, os, sys;sys.stdout.write(os.path.dirname(PyQt5.__file__))"))
+	pyinstaller -F $< -i ./icons/usb.ico --path="$(PYQTPATH)\Qt\bin"
 
 run: build dist\launchPyquino.exe
 	dist\launchPyquino.exe

Pyquino.e4p

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
 <!-- eric project file for project Pyquino -->
-<!-- Saved: 2017-08-11, 12:13:43 -->
+<!-- Saved: 2017-11-19, 13:59:24 -->
 <!-- Copyright (C) 2017 you-sheng,  -->
 <Project version="5.1">
   <Language>en_US</Language>
@@ -13,46 +13,20 @@
   <Email></Email>
   <Eol index="0"/>
   <Sources>
-    <Source>core/GraphyViewModule.py</Source>
-    <Source>core/RightClick.py</Source>
     <Source>core/Ui_mainwindow.py</Source>
     <Source>core/Ui_settingForm.py</Source>
     <Source>core/__init__.py</Source>
-    <Source>core/gcode/gcodeParser.py</Source>
-    <Source>core/graphy/Ui_graphy.py</Source>
-    <Source>core/graphy/__init__.py</Source>
-    <Source>core/graphy/graphy.py</Source>
     <Source>core/info.py</Source>
     <Source>core/mainwindow.py</Source>
-    <Source>core/monitor/Ui_machine_mointor.py</Source>
-    <Source>core/monitor/__init__.py</Source>
-    <Source>core/monitor/machine_mointor.py</Source>
     <Source>core/serialportcontext.py</Source>
     <Source>core/serialportedittext.py</Source>
     <Source>core/settingForm.py</Source>
-    <Source>core/vrep/Ui_vrep_setting.py</Source>
-    <Source>core/vrep/vrep_setting.py</Source>
-    <Source>core/vrep/vrep_test.py</Source>
-    <Source>core/vrep_remoAPI/one_link_robot_remoteAPI_joint_position.py</Source>
-    <Source>core/vrep_remoAPI/vrep.py</Source>
-    <Source>core/vrep_remoAPI/vrepConst.py</Source>
     <Source>icons_rc.py</Source>
     <Source>launchPyquino.py</Source>
-    <Source>opgl_class.py</Source>
-    <Source>pnael.py</Source>
-    <Source>test.py</Source>
-    <Source>test1.py</Source>
-    <Source>testCode/opencvTest.py</Source>
-    <Source>testCode/test.py</Source>
   </Sources>
   <Forms>
-    <Form>core/settingForm.ui</Form>
-    <Form>core/gcode/mainwindow.ui</Form>
-    <Form>core/graphy/graphy.ui</Form>
     <Form>core/mainwindow.ui</Form>
-    <Form>core/monitor/machine_mointor.ui</Form>
-    <Form>core/monitor/mainwindow.ui</Form>
-    <Form>core/vrep/vrep_setting.ui</Form>
+    <Form>core/settingForm.ui</Form>
   </Forms>
   <Translations/>
   <Resources>