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

Only post tools for active operations

Browse Source 
Only post tools and tool changes for active operations.
This commit is contained in:
Daniel Wood
2020-03-01 16:46:29 +00:00
parent b322969752
commit 101edb33f5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Path/PathScripts/PathPost.py
View File

@@ -299,7 +299,7 @@ class CommandPathPost:
# Now generate the gcode
for obj in job.Operations.Group:
tc = PathUtil.toolControllerForOp(obj)
if tc is not None:
if tc is not None and obj.Active:
if tc.ToolNumber != currTool:
sublist.append(tc)
PathLog.debug("Appending TC: {}".format(tc.Name))
@@ -330,13 +330,13 @@ class CommandPathPost:
for idx, obj in enumerate(job.Operations.Group):
tc = PathUtil.toolControllerForOp(obj)
if tc is None or tc.ToolNumber == currTool:
if tc is None or tc.ToolNumber == currTool or not obj.Active:
curlist.append(obj)
elif tc.ToolNumber != currTool and currTool is None: # first TC
elif tc.ToolNumber != currTool and currTool is None and obj.Active: # first TC
sublist.append(tc)
curlist.append(obj)
currTool = tc.ToolNumber
elif tc.ToolNumber != currTool and currTool is not None: # TC
elif tc.ToolNumber != currTool and currTool is not None and obj.Active: # TC
for fixture in fixturelist:
sublist.append(fixture)
sublist.extend(curlist)
@@ -373,7 +373,7 @@ class CommandPathPost:
for fixture in fixturelist:
sublist.append(fixture)
tc = PathUtil.toolControllerForOp(obj)
if tc is not None:
if tc is not None and obj.Active:
if tc.ToolNumber != currTool:
sublist.append(tc)
currTool = tc.ToolNumber