From 2f730558256ea200f6eb15eddba028a8892c6650 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Mon, 28 Dec 2020 17:13:10 -0800 Subject: [PATCH] Use job.ToolTable.Group instead of job.ToolController. --- src/Mod/Path/PathScripts/PathJobCmd.py | 2 +- src/Mod/Path/PathScripts/PathJobDlg.py | 2 +- src/Mod/Path/PathScripts/PathSanity.py | 2 +- src/Mod/Path/PathScripts/PathToolControllerGui.py | 4 ++-- src/Mod/Path/PathScripts/PathUtils.py | 2 +- src/Mod/Path/PathTests/TestPathHelix.py | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathJobCmd.py b/src/Mod/Path/PathScripts/PathJobCmd.py index 9b600dc32b..b452304d79 100644 --- a/src/Mod/Path/PathScripts/PathJobCmd.py +++ b/src/Mod/Path/PathScripts/PathJobCmd.py @@ -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 diff --git a/src/Mod/Path/PathScripts/PathJobDlg.py b/src/Mod/Path/PathScripts/PathJobDlg.py index a28466eb3c..e54a990e8f 100644 --- a/src/Mod/Path/PathScripts/PathJobDlg.py +++ b/src/Mod/Path/PathScripts/PathJobDlg.py @@ -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) diff --git a/src/Mod/Path/PathScripts/PathSanity.py b/src/Mod/Path/PathScripts/PathSanity.py index 09664be146..1207891168 100644 --- a/src/Mod/Path/PathScripts/PathSanity.py +++ b/src/Mod/Path/PathScripts/PathSanity.py @@ -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 \ diff --git a/src/Mod/Path/PathScripts/PathToolControllerGui.py b/src/Mod/Path/PathScripts/PathToolControllerGui.py index 62709086e0..8f72838df9 100644 --- a/src/Mod/Path/PathScripts/PathToolControllerGui.py +++ b/src/Mod/Path/PathScripts/PathToolControllerGui.py @@ -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() diff --git a/src/Mod/Path/PathScripts/PathUtils.py b/src/Mod/Path/PathScripts/PathUtils.py index 5bc5011756..1b8aba0950 100644 --- a/src/Mod/Path/PathScripts/PathUtils.py +++ b/src/Mod/Path/PathScripts/PathUtils.py @@ -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 [] diff --git a/src/Mod/Path/PathTests/TestPathHelix.py b/src/Mod/Path/PathTests/TestPathHelix.py index 0fb76c9f1a..28dc4b7d18 100644 --- a/src/Mod/Path/PathTests/TestPathHelix.py +++ b/src/Mod/Path/PathTests/TestPathHelix.py @@ -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