Backed out some path changes.

This commit is contained in:
Jeremy Wright 2014-12-02 23:15:29 -05:00
parent df70a95868
commit 48462edec6

View File

@ -34,17 +34,17 @@ class CadQueryWorkbench (Workbench):
def Activated(self): def Activated(self):
import os, sys import os, sys
import module_locator import module_locator
from Gui import ImportCQ
#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_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, os.path.join(libs_dir_path, 'cadquery'))
sys.path.insert(0, libs_dir_path) #sys.path.insert(0, libs_dir_path)
sys.path.insert(0, libs_path) sys.path.insert(0, libs_path)
import cadquery import cadquery
from Gui import ImportCQ
from pyqode.python.widgets import PyCodeEdit from pyqode.python.widgets import PyCodeEdit
from PySide import QtGui, QtCore from PySide import QtGui, QtCore
@ -110,7 +110,7 @@ class CadQueryWorkbench (Workbench):
, args=['-s', libs_path, fc_lib_path, os.path.join(libs_dir_path, 'cadquery')]) , args=['-s', libs_path, fc_lib_path, os.path.join(libs_dir_path, 'cadquery')])
else: else:
codePane = PyCodeEdit(server_script=server_path, interpreter=interpreter codePane = PyCodeEdit(server_script=server_path, interpreter=interpreter
, args=['-s', libs_path, libs_dir_path, os.path.join(libs_dir_path, 'cadquery')]) , args=['-s', libs_path, os.path.join(libs_dir_path, 'cadquery')])
codePane.setObjectName("cqCodePane") codePane.setObjectName("cqCodePane")