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

Use job.ToolTable.Group instead of job.ToolController.

Browse Source
This commit is contained in:
Markus Lampert
2020-12-28 17:13:10 -08:00
parent 8cf51ab5a7
commit 2f73055825
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Path/PathScripts/PathJobCmd.py
View File

@@ -146,7 +146,7 @@ class CommandJobTemplateExport:
attrs.pop(PathJob.JobTemplate.PostProcessorOutputFile, None)
# tool controller settings
toolControllers = dialog.includeToolControllers() if dialog else job.ToolController
toolControllers = dialog.includeToolControllers() if dialog else job.ToolTable.Group
if toolControllers:
tcAttrs = [tc.Proxy.templateAttrs(tc) for tc in toolControllers]
attrs[PathJob.JobTemplate.ToolController] = tcAttrs

2
src/Mod/Path/PathScripts/PathJobDlg.py
View File

@@ -338,7 +338,7 @@ class JobTemplateExport:
self.dialog.settingsOpsList.addItem(item)
self.dialog.toolsList.clear()
for tc in sorted(job.ToolController, key=lambda o: o.Label):
for tc in sorted(job.ToolTable.Group, key=lambda o: o.Label):
item = QtGui.QListWidgetItem(tc.Label)
item.setData(self.DataObject, tc)
item.setCheckState(QtCore.Qt.CheckState.Checked)

2
src/Mod/Path/PathScripts/PathSanity.py
View File

@@ -517,7 +517,7 @@ class CommandPathSanity:
data = {}
try:
for TC in obj.ToolController:
for TC in obj.ToolTable.Group:
if not hasattr(TC.Tool, 'BitBody'):
self.squawk("PathSanity",
"Tool number {} is a legacy tool. Legacy tools not \

4
src/Mod/Path/PathScripts/PathToolControllerGui.py
View File

@@ -165,12 +165,12 @@ class CommandPathToolController(object):
tool = PathToolBitGui.ToolBitSelector().getTool()
if tool:
toolNr = None
for tc in job.ToolController:
for tc in job.ToolTable.Group:
if tc.Tool == tool:
toolNr = tc.ToolNumber
break
if not toolNr:
toolNr = max([tc.ToolNumber for tc in job.ToolController]) + 1
toolNr = max([tc.ToolNumber for tc in job.ToolTable.Group]) + 1
tc = Create("TC: {}".format(tool.Label), tool, toolNr)
job.Proxy.addToolController(tc)
FreeCAD.ActiveDocument.recompute()

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

@@ -403,7 +403,7 @@ def getToolControllers(obj, proxy=None):
PathLog.debug("op={} ({})".format(obj.Label, type(obj)))
if job:
return [c for c in job.ToolController if proxy.isToolSupported(obj, c.Tool)]
return [tc for tc in job.ToolTable.Group if proxy.isToolSupported(obj, tc.Tool)]
return []

6
src/Mod/Path/PathTests/TestPathHelix.py
View File

@@ -62,7 +62,7 @@ class TestPathHelix(PathTestUtils.PathTestBase):
def test02(self):
'''Verify Helix generates proper holes for rotated model'''
self.job.ToolController[0].Tool.Diameter = 0.5
self.job.ToolTable.Group[0].Tool.Diameter = 0.5
op = PathHelix.Create('Helix')
proxy = op.Proxy
@@ -87,7 +87,7 @@ class TestPathHelix(PathTestUtils.PathTestBase):
self.doc.Body.Placement.Rotation = FreeCAD.Rotation(deg, 0, 0)
self.job = PathJob.Create('Job', [self.doc.Body])
self.job.ToolController[0].Tool.Diameter = 0.5
self.job.ToolTable.Group[0].Tool.Diameter = 0.5
op = PathHelix.Create('Helix')
proxy = op.Proxy
@@ -109,7 +109,7 @@ class TestPathHelix(PathTestUtils.PathTestBase):
self.clone.Placement.Rotation = FreeCAD.Rotation(deg, 0, 0)
self.job = PathJob.Create('Job', [self.clone])
self.job.ToolController[0].Tool.Diameter = 0.5
self.job.ToolTable.Group[0].Tool.Diameter = 0.5
op = PathHelix.Create('Helix')
proxy = op.Proxy