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

FreeCAD · Dec 31, 2020 · 121152d · 121152d
1 parent 8a95005
commit 121152d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/Mod/Path/PathScripts/PathJobCmd.py b/src/Mod/Path/PathScripts/PathJobCmd.py
@@ -146,7 +146,7 @@ def Execute(cls, job, path, dialog=None):
             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
@@ -338,7 +338,7 @@ def updateUI(self):
             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
@@ -517,7 +517,7 @@ def __toolData(self, obj):
         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
@@ -165,12 +165,12 @@ def Activated(self):
             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
@@ -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
@@ -62,7 +62,7 @@ def test01(self):
     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 @@ def test03(self):
             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 @@ def test04(self):
             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