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

Got autocomplete mostly working on both Linux and Windows.

Browse Source
This commit is contained in:
Jeremy Wright 2014-12-02 15:29:36 -05:00
parent a8eb25d936
commit 8fc9a3b397
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CadQuery/InitGui.py
View File

@ -39,8 +39,8 @@ class CadQueryWorkbench (Workbench):
#Set up so that we can import from our embedded packages #Set up so that we can import from our embedded packages
module_base_path = module_locator.module_path() module_base_path = module_locator.module_path()
libs_path = os.path.join(module_base_path, 'Libs') libs_dir_path = os.path.join(module_base_path, 'Libs')
libs_path = os.path.join(libs_path, 'libs.zip') libs_path = os.path.join(libs_dir_path, 'libs.zip')
sys.path.insert(0, libs_path) sys.path.insert(0, libs_path)
import cadquery import cadquery
@ -100,11 +100,15 @@ class CadQueryWorkbench (Workbench):
#Windows needs some exra help with paths #Windows needs some exra help with paths
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
#The lib directory under the FreeCAD installation
fc_lib_path = os.path.dirname(os.path.dirname(module_base_path)) fc_lib_path = os.path.dirname(os.path.dirname(module_base_path))
fc_lib_path = os.path.join(fc_lib_path, 'lib') fc_lib_path = os.path.join(fc_lib_path, 'lib')
codePane = PyCodeEdit(server_script=server_path, interpreter=interpreter, args=['-s', libs_path, fc_lib_path])
codePane = PyCodeEdit(server_script=server_path, interpreter=interpreter
, args=['-s', libs_path, fc_lib_path, os.path.join(libs_dir_path, 'cadquery')])
else: else:
codePane = PyCodeEdit(server_script=server_path, interpreter=interpreter, args=['-s', libs_path]) codePane = PyCodeEdit(server_script=server_path, interpreter=interpreter
, args=['-s', libs_path, os.path.join(libs_dir_path, 'cadquery')])
codePane.setObjectName("cqCodePane") codePane.setObjectName("cqCodePane")

1
CadQuery/Libs/cadquery Submodule

@ -0,0 +1 @@
Subproject commit 40efd2599a867d633037fe3d47fe8299325f7b50