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

CAM: KeepToolDown in Dressup Boundary

Browse Source
This commit is contained in:
tarman3
2025-05-07 09:42:16 +03:00
parent d1a69d6ec5
commit a7f6a84ea4
1 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/Mod/CAM/Path/Dressup/Boundary.py
View File

@@ -73,6 +73,16 @@ class DressupPathBoundary(object):
),
)
obj.Inside = True
obj.addProperty(
"App::PropertyBool",
"KeepToolDown",
"Boundary",
QT_TRANSLATE_NOOP(
"App::Property",
"Keep tool down.",
),
)
obj.KeepToolDown = False
self.obj = obj
self.safeHeight = None
@@ -86,6 +96,16 @@ class DressupPathBoundary(object):
def onDocumentRestored(self, obj):
self.obj = obj
if not hasattr(obj, "KeepToolDown"):
obj.addProperty(
"App::PropertyBool",
"KeepToolDown",
"Boundary",
QT_TRANSLATE_NOOP(
"App::Property",
"Keep tool down.",
),
)
def onDelete(self, obj, args):
if obj.Base:
@@ -101,7 +121,7 @@ class DressupPathBoundary(object):
return True
def execute(self, obj):
pb = PathBoundary(obj.Base, obj.Stock.Shape, obj.Inside)
pb = PathBoundary(obj.Base, obj.Stock.Shape, obj.Inside, obj.KeepToolDown)
obj.Path = pb.execute()
@@ -115,7 +135,7 @@ class PathBoundary:
the provided boundary shape.
"""
def __init__(self, baseOp, boundaryShape, inside=True):
def __init__(self, baseOp, boundaryShape, inside=True, keepToolDown=False):
self.baseOp = baseOp
self.boundary = boundaryShape
self.inside = inside
@@ -123,22 +143,35 @@ class PathBoundary:
self.clearanceHeight = None
self.strG0ZsafeHeight = None
self.strG0ZclearanceHeight = None
self.keepToolDown = keepToolDown
def boundaryCommands(self, begin, end, verticalFeed):
def boundaryCommands(
self, begin, end, verticalFeed, horizFeed=None, keepToolDown=False, isStartMovements=False
):
Path.Log.track(_vstr(begin), _vstr(end))
if end and Path.Geom.pointsCoincide(begin, end):
return []
cmds = []
if begin.z < self.safeHeight:
cmds.append(self.strG0ZsafeHeight)
if begin.z < self.clearanceHeight:
cmds.append(self.strG0ZclearanceHeight)
if end:
cmds.append(Path.Command("G0", {"X": end.x, "Y": end.y}))
if end.z < self.clearanceHeight:
cmds.append(Path.Command("G0", {"Z": max(self.safeHeight, end.z)}))
if end.z < self.safeHeight:
cmds.append(Path.Command("G1", {"Z": end.z, "F": verticalFeed}))
if isStartMovements or not keepToolDown:
if begin.z < self.safeHeight:
cmds.append(self.strG0ZsafeHeight)
if begin.z < self.clearanceHeight:
cmds.append(self.strG0ZclearanceHeight)
if end:
cmds.append(Path.Command("G0", {"X": end.x, "Y": end.y}))
if end.z < self.clearanceHeight:
cmds.append(Path.Command("G0", {"Z": max(self.safeHeight, end.z)}))
if end.z < self.safeHeight:
cmds.append(Path.Command("G1", {"Z": end.z, "F": verticalFeed}))
else:
if end:
if horizFeed and Path.Geom.isRoughly(begin.z, end.z, 0.001):
speed = horizFeed
else:
verticalFeed
cmds.append(Path.Command("G1", {"X": end.x, "Y": end.y, "Z": end.z, "F": speed}))
return cmds
def execute(self):
@@ -169,6 +202,7 @@ class PathBoundary:
bogusY = True
commands = [cmd]
lastExit = None
isStartMovements = True
for cmd in path.Commands[1:]:
if cmd.Name in Path.Geom.CmdMoveAll:
if bogusX:
@@ -220,8 +254,16 @@ class PathBoundary:
if lastExit:
if not (bogusX or bogusY):
commands.extend(
self.boundaryCommands(lastExit, pos, tc.VertFeed.Value)
self.boundaryCommands(
lastExit,
pos,
tc.VertFeed.Value,
tc.HorizFeed.Value,
self.keepToolDown,
isStartMovements,
)
)
isStartMovements = False
lastExit = None
Path.Log.track(e, flip)
if not (