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

PathUtils: remove unnecessary arguments to convert()

Browse Source 
The arguments Side, radius, clockwise, and firstedge were never used in
convert()
This commit is contained in:
Lorenz Hüdepohl 2016-06-12 15:48:17 +02:00 committed by wmayer
parent c862fc0065
commit 092e8e10c1
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Mod/Path/PathScripts/PathUtils.py
View File

@ -184,8 +184,8 @@ def reverseEdge(e):
return newedge return newedge
def convert(toolpath, Side, radius, clockwise=False, Z=0.0, firstedge=None, vf=1.0, hf=2.0, PlungeAngle=90.0, Zprevious=None, StopLength=None): def convert(toolpath, Z=0.0, PlungeAngle=90.0, Zprevious=None, StopLength=None, vf=1.0, hf=2.0) :
'''convert(toolpath,Side,radius,clockwise=False,Z=0.0,firstedge=None) Converts lines and arcs to G1,G2,G3 moves. Returns a string.''' '''convert(toolpath,Z=0.0,vf=1.0,hf=2.0,PlungeAngle=90.0,Zprevious=None,StopLength=None) Converts lines and arcs to G1,G2,G3 moves. Returns a string.'''
if PlungeAngle != 90.0: if PlungeAngle != 90.0:
if Zprevious is None: if Zprevious is None:
@ -379,36 +379,30 @@ def MakePath(wire, Side, radius, clockwise, ZClearance, StepDown, ZStart, ZFinal
paths += "G0 X" + str(fmt(first.x)) + "Y" + str(fmt(first.y)) + "\n" paths += "G0 X" + str(fmt(first.x)) + "Y" + str(fmt(first.y)) + "\n"
Zprevious = ZStart Zprevious = ZStart
ZCurrent = ZStart - StepDown ZCurrent = ZStart - StepDown
if PathClosed:
while ZCurrent > ZFinalDepth: while ZCurrent > ZFinalDepth:
paths += convert(toolpath, Side, radius, clockwise, paths += convert(toolpath, Z=ZCurrent, Zprevious=Zprevious, PlungeAngle=PlungeAngle,
ZCurrent, firstedge, VertFeed, HorizFeed, PlungeAngle=PlungeAngle, Zprevious=Zprevious) vf=VertFeed, hf=HorizFeed)
Zprevious = ZCurrent if not PathClosed:
ZCurrent = ZCurrent - abs(StepDown)
paths += convert(toolpath, Side, radius, clockwise,
ZFinalDepth, firstedge, VertFeed, HorizFeed, PlungeAngle=PlungeAngle, Zprevious=Zprevious)
else:
while ZCurrent > ZFinalDepth:
paths += convert(toolpath, Side, radius, clockwise,
ZCurrent, firstedge, VertFeed, HorizFeed, PlungeAngle=PlungeAngle, Zprevious=Zprevious)
paths += "G0 Z" + str(ZClearance) paths += "G0 Z" + str(ZClearance)
paths += "G0 X" + str(fmt(first.x)) + "Y" + \ paths += "G0 X" + str(fmt(first.x)) + "Y" + \
str(fmt(first.y)) + "\n" str(fmt(first.y)) + "\n"
Zprevious = ZCurrent Zprevious = ZCurrent
ZCurrent = ZCurrent - abs(StepDown) ZCurrent = ZCurrent - abs(StepDown)
paths += convert(toolpath, Side, radius, clockwise,
ZFinalDepth, firstedge, VertFeed, HorizFeed, PlungeAngle=PlungeAngle, Zprevious=Zprevious)
# do the final Z value
paths += convert(toolpath, Z=ZFinalDepth, Zprevious=Zprevious, PlungeAngle=PlungeAngle,
vf=VertFeed, hf=HorizFeed)
# have to do one last pass to clear the remaining ramp # when plunging with != 90 degree we have to do one last pass to clear the remaining ramp
if PlungeAngle != 90.0: if PlungeAngle != 90.0:
tanA = math.tan(math.pi * PlungeAngle / 180.0) tanA = math.tan(math.pi * PlungeAngle / 180.0)
if tanA <= 0.0: if tanA <= 0.0:
StopLength=None StopLength=None
else: else:
StopLength=abs(StepDown/tanA) StopLength=abs(StepDown/tanA)
paths += convert(toolpath, Side, radius, clockwise, paths += convert(toolpath, Z=ZFinalDepth, Zprevious=Zprevious, StopLength=StopLength,
ZFinalDepth, firstedge, VertFeed, HorizFeed, StopLength=StopLength) vf=VertFeed, hf=HorizFeed)
paths += "G0 Z" + str(ZClearance) paths += "G0 Z" + str(ZClearance)
return paths return paths