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

Renamed LoadTool to ToolController.

Browse Source
This commit is contained in:
Markus Lampert
2017-06-05 16:00:42 -07:00
parent c4cb45c1b4
commit 8d8ea9979f
44 changed files with 545 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,13 +307,13 @@ def changeTool(obj, job):
tlnum = 0
for p in job.Group:
if not hasattr(p, "Group"):
if isinstance(p.Proxy, PathScripts.PathLoadTool.LoadTool) and p.ToolNumber > 0:
if isinstance(p.Proxy, PathScripts.PathToolController.ToolController) and p.ToolNumber > 0:
tlnum = p.ToolNumber
if p == obj:
return tlnum
elif hasattr(p, "Group"):
for g in p.Group:
if isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool):
if isinstance(g.Proxy, PathScripts.PathToolController.ToolController):
tlnum = g.ToolNumber
if g == obj:
return tlnum
@@ -330,7 +330,7 @@ def getToolControllers(obj):
if parent is not None and hasattr(parent, 'Group'):
sibs = parent.Group
for g in sibs:
if isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool):
if isinstance(g.Proxy, PathScripts.PathToolController.ToolController):
controllers.append(g)
return controllers
@@ -345,7 +345,7 @@ def findToolController(obj, name=None):
# First check if a user has selected a tool controller in the tree. Return the first one and remove all from selection
for sel in FreeCADGui.Selection.getSelectionEx():
if hasattr(sel.Object, 'Proxy'):
if isinstance(sel.Object.Proxy, PathScripts.PathLoadTool.LoadTool):
if isinstance(sel.Object.Proxy, PathScripts.PathToolController.ToolController):
if c is None:
c = sel.Object
FreeCADGui.Selection.removeSelection(sel.Object)