suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error handling if NumPy is not there

Browse Source
This commit is contained in:
jriegel 2014-09-09 17:45:50 +02:00 committed by Stefan Tröger
parent 396f188f30
commit 015183a0d7
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,10 @@ class PartDesignWorkbench ( Workbench ):
from WizardShaft import WizardShaft
except ImportError:
print "Wizard shaft module cannot be loaded"
from FeatureHole import HoleGui
try:
from FeatureHole import HoleGui
except:
pass
import PartDesignGui
import PartDesign
try:

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

@ -36,13 +36,14 @@ class PartDesignWorkbench ( Workbench ):
self.__class__.MenuText = "Part Design"
self.__class__.ToolTip = "Part Design workbench"
<<<<<<< 64a1a440055b8a4359349b7abffe8956e78196db
<<<<<<< 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
import PartDesignGui
import PartDesign
try:
@ -58,7 +59,10 @@ class PartDesignWorkbench ( Workbench ):
from WizardShaft import WizardShaft
except ImportError:
print "Wizard shaft module cannot be loaded"
from FeatureHole import HoleGui
try:
from FeatureHole import HoleGui
except:
pass
import PartDesignGui
import PartDesign
try:
@ -67,6 +71,6 @@ class PartDesignWorkbench ( Workbench ):
print "Involute gear module cannot be loaded"
def GetClassName(self):
return "PartDesignGui::Workbench"
>>>>>>> Python code of Hole Feature
>>>>>>> Error handling if NumPy is not there
Gui.addWorkbench(PartDesignWorkbench())