kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

some fixes

Browse Source
This commit is contained in:
jriegel
2014-11-08 20:29:38 +01:00
committed by Stefan Tröger
parent dc4fdc2c53
commit d59904fd37
5 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/PartDesign/InitGui.py
View File

@@ -52,6 +52,11 @@ class PartDesignWorkbench ( Workbench ):
import InvoluteGearFeature
except ImportError:
print "Involute gear module cannot be loaded"
try:
from FeatureHole import HoleGui
except:
pass
def GetClassName(self):
return "PartDesignGui::Workbench"

24
src/Mod/PartDesign/InitGui.py.orig
View File

@@ -36,14 +36,17 @@ class PartDesignWorkbench ( Workbench ):
self.__class__.MenuText = "Part Design"
self.__class__.ToolTip = "Part Design workbench"
<<<<<<< ae478b98ed61389183af93a610e1a07448918eb5
def Initialize(self):
# load the module
try:
from WizardShaft import WizardShaft
except ImportError:
print "Wizard shaft module cannot be loaded"
from FeatureHole import HoleGui
try:
from FeatureHole import HoleGui
except:
pass
<<<<<<< 1cdecc120fcdcd3447f72fdd734cf6c4f78b056b
import PartDesignGui
import PartDesign
try:
@@ -53,24 +56,19 @@ class PartDesignWorkbench ( Workbench ):
def GetClassName(self):
return "PartDesignGui::Workbench"
=======
def Initialize(self):
# load the module
try:
from WizardShaft import WizardShaft
except ImportError:
print "Wizard shaft module cannot be loaded"
try:
from FeatureHole import HoleGui
except:
pass
import PartDesignGui
import PartDesign
try:
import InvoluteGearFeature
except ImportError:
print "Involute gear module cannot be loaded"
try:
from FeatureHole import HoleGui
except:
pass
def GetClassName(self):
return "PartDesignGui::Workbench"
>>>>>>> Error handling if NumPy is not there
>>>>>>> some fixes
Gui.addWorkbench(PartDesignWorkbench())