Skip to content

Commit

Permalink
Per Zultron. Fixed undefined symbol
Browse files Browse the repository at this point in the history
  • Loading branch information
sliptonic authored and yorikvanhavre committed May 23, 2016
1 parent 22e788d commit 7faaede
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/Mod/Path/PathScripts/PathPocket.py
Expand Up @@ -276,10 +276,10 @@ def helicalPlunge(plungePos, rampangle, destZ, startZ):
#startZ is the height we can safely feed down to before helix-ing
helixCmds = "(START HELICAL PLUNGE)\n"
if(plungePos == None):
raise Error("Helical plunging requires a position!")
raise Exception("Helical plunging requires a position!")
return None
if(not tool):
raise Error("Helical plunging requires a tool!")
raise Exception("Helical plunging requires a tool!")
return None

helixX = plungePos.x + tool.Diameter/2. * plungeR
Expand Down Expand Up @@ -320,10 +320,10 @@ def rampPlunge(edge, rampangle, destZ, startZ):

rampCmds = "(START RAMP PLUNGE)\n"
if(edge == None):
raise Error("Ramp plunging requires an edge!")
raise Exception("Ramp plunging requires an edge!")
return None
if(not tool):
raise Error("Ramp plunging requires a tool!")
raise Exception("Ramp plunging requires a tool!")


sPoint = edge.Vertexes[0].Point
Expand Down Expand Up @@ -351,7 +351,7 @@ def rampPlunge(edge, rampangle, destZ, startZ):

#If it's an arc, handle it!
if isinstance(edge.Curve,Part.Circle):
raise Error("rampPlunge: Screw it, not handling an arc.")
raise Exception("rampPlunge: Screw it, not handling an arc.")
#Straight feed! Easy!
else:
rampCmds += feed(ePoint.x, ePoint.y, curZ)
Expand Down Expand Up @@ -405,7 +405,7 @@ def rampPlunge(edge, rampangle, destZ, startZ):
rampEdge = None
tool = PathUtils.getTool(obj,obj.ToolNumber)
if not tool:
raise Error("Ramp plunge location-finding requires a tool")
raise Exception("Ramp plunge location-finding requires a tool")
return
else:
#Since we're going to start machining either the inner-most
Expand Down

0 comments on commit 7faaede

Please sign in to comment.