Skip to content

Commit bd2682e

Browse files
committed
release serial branch
1 parent 1c346d4 commit bd2682e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+18
-6971
lines changed

.eric6project/Pyquino.e4q

Lines changed: 0 additions & 6 deletions
This file was deleted.

.eric6project/Pyquino.e6t

Lines changed: 0 additions & 7 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Byte-compiled / optimized / DLL files
22
__pycache__/
3+
_eric6project/
4+
.eric6project/
35
*.py[cod]
46
*$py.class
57

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#Pyquino Makefile
22

3-
all: build run
3+
all: build
44

55
build: launchPyquino.py
6-
pyinstaller -F $< -i ./icons/usb.ico \
7-
--path="C:\Users\Lin\AppData\Local\Programs\Python\Python35\Lib\site-packages\PyQt5\Qt\bin" \
8-
--add-binary="core/vrep_remoAPI/remoteApi.dll;."
6+
$(eval PYQTPATH = $(shell python -c "import PyQt5, os, sys;sys.stdout.write(os.path.dirname(PyQt5.__file__))"))
7+
pyinstaller -F $< -i ./icons/usb.ico --path="$(PYQTPATH)\Qt\bin"
98

109
run: build dist\launchPyquino.exe
1110
dist\launchPyquino.exe

Pyquino.e4p

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE Project SYSTEM "Project-5.1.dtd">
33
<!-- eric project file for project Pyquino -->
4-
<!-- Saved: 2017-08-11, 12:13:43 -->
4+
<!-- Saved: 2017-11-19, 13:59:24 -->
55
<!-- Copyright (C) 2017 you-sheng, -->
66
<Project version="5.1">
77
<Language>en_US</Language>
@@ -13,46 +13,20 @@
1313
<Email></Email>
1414
<Eol index="0"/>
1515
<Sources>
16-
<Source>core/GraphyViewModule.py</Source>
17-
<Source>core/RightClick.py</Source>
1816
<Source>core/Ui_mainwindow.py</Source>
1917
<Source>core/Ui_settingForm.py</Source>
2018
<Source>core/__init__.py</Source>
21-
<Source>core/gcode/gcodeParser.py</Source>
22-
<Source>core/graphy/Ui_graphy.py</Source>
23-
<Source>core/graphy/__init__.py</Source>
24-
<Source>core/graphy/graphy.py</Source>
2519
<Source>core/info.py</Source>
2620
<Source>core/mainwindow.py</Source>
27-
<Source>core/monitor/Ui_machine_mointor.py</Source>
28-
<Source>core/monitor/__init__.py</Source>
29-
<Source>core/monitor/machine_mointor.py</Source>
3021
<Source>core/serialportcontext.py</Source>
3122
<Source>core/serialportedittext.py</Source>
3223
<Source>core/settingForm.py</Source>
33-
<Source>core/vrep/Ui_vrep_setting.py</Source>
34-
<Source>core/vrep/vrep_setting.py</Source>
35-
<Source>core/vrep/vrep_test.py</Source>
36-
<Source>core/vrep_remoAPI/one_link_robot_remoteAPI_joint_position.py</Source>
37-
<Source>core/vrep_remoAPI/vrep.py</Source>
38-
<Source>core/vrep_remoAPI/vrepConst.py</Source>
3924
<Source>icons_rc.py</Source>
4025
<Source>launchPyquino.py</Source>
41-
<Source>opgl_class.py</Source>
42-
<Source>pnael.py</Source>
43-
<Source>test.py</Source>
44-
<Source>test1.py</Source>
45-
<Source>testCode/opencvTest.py</Source>
46-
<Source>testCode/test.py</Source>
4726
</Sources>
4827
<Forms>
49-
<Form>core/settingForm.ui</Form>
50-
<Form>core/gcode/mainwindow.ui</Form>
51-
<Form>core/graphy/graphy.ui</Form>
5228
<Form>core/mainwindow.ui</Form>
53-
<Form>core/monitor/machine_mointor.ui</Form>
54-
<Form>core/monitor/mainwindow.ui</Form>
55-
<Form>core/vrep/vrep_setting.ui</Form>
29+
<Form>core/settingForm.ui</Form>
5630
</Forms>
5731
<Translations/>
5832
<Resources>

_eric6project/Pyquino.e4q

Lines changed: 0 additions & 6 deletions
This file was deleted.

_eric6project/Pyquino.e6t

Lines changed: 0 additions & 16 deletions
This file was deleted.

_eric6project/pad_solve.e4q

Lines changed: 0 additions & 6 deletions
This file was deleted.

_eric6project/pad_solve.e6t

Lines changed: 0 additions & 25 deletions
This file was deleted.

core/GraphyViewModule.py

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)