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

[Path] Fix initial descent at start

Browse Source
This commit is contained in:
sliptonic
2022-03-28 16:30:41 -05:00
parent 1b5b6965cc
commit d51608bce5
1 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Mod/Path/PathScripts/PathDressupLeadInOut.py
View File

@@ -41,7 +41,7 @@ from PathPythonGui.simple_edit_panel import SimpleEditPanel
translate = FreeCAD.Qt.translate
if False:
if True:
PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule())
PathLog.trackModule(PathLog.thisModule())
else:
@@ -354,6 +354,16 @@ class ObjectDressup:
# leadlinevec provides the offset from the beginning of the lead arc to the beginning of the extend line
extendstart = leadstart.add(leadlinevec)
# commandname = "G0" if obj.RapidPlunge else "G1"
# extendcommand = Path.Command(
# commandname,
# {
# "X": leadstart.x,
# "Y": leadstart.y,
# "Z": p1.z,
# },
# )
# results.append(extendcommand)
if action == "start":
if obj.ExtendLeadIn != 0:
# Rapid move to beginning of extend line
@@ -369,7 +379,7 @@ class ObjectDressup:
# Rapid move to beginning of leadin arc
extendcommand = Path.Command(
"G0",
{"X": leadstart.x, "Y": leadstart.y, "Z": op.ClearanceHeight.Value},
{"X": extendstart.x, "Y": extendstart.y, "Z": op.ClearanceHeight.Value},
)
results.append(extendcommand)
extendcommand = Path.Command("G0", {"Z": op.SafeHeight.Value})
@@ -380,23 +390,33 @@ class ObjectDressup:
extendcommand = Path.Command("G0", {"Z": op.SafeHeight.Value})
results.append(extendcommand)
extendcommand = Path.Command("G0", {"X": leadstart.x, "Y": leadstart.y})
extendcommand = Path.Command("G0", {"X": extendstart.x, "Y": extendstart.y})
results.append(extendcommand)
if not obj.RapidPlunge:
extendcommand = Path.Command(
"G1", {"X": leadstart.x, "Y": leadstart.y, "Z": p1.z, "F": vertFeed}
)
else:
extendcommand = Path.Command(
"G0",
{
"X": leadstart.x,
"Y": leadstart.y,
"Z": p1.z,
},
)
commandname = "G0" if obj.RapidPlunge else "G1"
extendcommand = Path.Command(
commandname,
{
# "X": leadstart.x,
# "Y": leadstart.y,
"Z": p1.z,
},
)
results.append(extendcommand)
# if not obj.RapidPlunge:
# extendcommand = Path.Command(
# "G1", {"X": leadstart.x, "Y": leadstart.y, "Z": p1.z, "F": vertFeed}
# )
# else:
# extendcommand = Path.Command(
# "G0",
# {
# "X": leadstart.x,
# "Y": leadstart.y,
# "Z": p1.z,
# },
# )
# results.append(extendcommand)
if obj.UseMachineCRC:
if self.getDirectionOfPath(obj) == "right":
@@ -602,7 +622,7 @@ class ObjectDressup:
newpath.extend(temp)
for cmd in layer:
PathLog.debug("CurLoc: {}, NewCmd: {}".format(currLocation, cmd))
PathLog.debug("CurLoc: {}, NewCmd: {}!!".format(currLocation, cmd))
newpath.append(cmd)
if obj.LeadOut: