suzanne.soy/cadquery-freecad-module
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separated CadQuery out of libs.zip and fixed an import order error between PyQode and PySide.

Browse Source
This commit is contained in:
Jeremy Wright 2014-12-02 22:01:40 -05:00
parent f94a6018a5
commit e6b9715b9e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CadQuery/InitGui.py
View File

@ -33,7 +33,6 @@ class CadQueryWorkbench (Workbench):
def Activated(self): def Activated(self):
import os, sys import os, sys
from PySide import QtGui, QtCore
import module_locator import module_locator
from Gui import ImportCQ from Gui import ImportCQ
@ -41,10 +40,12 @@ class CadQueryWorkbench (Workbench):
module_base_path = module_locator.module_path() module_base_path = module_locator.module_path()
libs_dir_path = os.path.join(module_base_path, 'Libs') libs_dir_path = os.path.join(module_base_path, 'Libs')
libs_path = os.path.join(libs_dir_path, 'libs.zip') libs_path = os.path.join(libs_dir_path, 'libs.zip')
sys.path.insert(0, os.path.join(libs_dir_path, 'cadquery'))
sys.path.insert(0, libs_path) sys.path.insert(0, libs_path)
import cadquery import cadquery
from pyqode.python.widgets import PyCodeEdit from pyqode.python.widgets import PyCodeEdit
from PySide import QtGui, QtCore
msg = QtGui.QApplication.translate( msg = QtGui.QApplication.translate(
"cqCodeWidget", "cqCodeWidget",

BIN
CadQuery/Libs/libs.zip
View File

Binary file not shown.

4
CadQuery/Tools/package_libraries.py
View File

@ -13,10 +13,10 @@ ZIP = os.path.join(os.getcwd(), 'libs.zip')
if len(sys.argv) == 2 and sys.argv[1] == 'gen': if len(sys.argv) == 2 and sys.argv[1] == 'gen':
#--- gen zip file #--- gen zip file
import jedi, pep8, pyqode, pyqode.core, pyqode.python, pyqode.qt, pygments, frosted, pies, builtins, future, \ import jedi, pep8, pyqode, pyqode.core, pyqode.python, pyqode.qt, pygments, frosted, pies, builtins, future, \
docutils, cadquery docutils
from qidle.system import embed_package_into_zip from qidle.system import embed_package_into_zip
embed_package_into_zip([jedi, pep8, pyqode, pyqode.core, pyqode.python, embed_package_into_zip([jedi, pep8, pyqode, pyqode.core, pyqode.python,
pyqode.qt, pygments, frosted, pies, builtins, future, docutils, cadquery], ZIP) pyqode.qt, pygments, frosted, pies, builtins, future, docutils], ZIP)
else: else:
# remove all pyqode path from sys.path (to make sure the package are # remove all pyqode path from sys.path (to make sure the package are
# imported from the zip archive) # imported from the zip archive)