suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Group issue on fetching the tool; - added recursive parent traversal to deal with dressups and dressups of dressups ...

Browse Source
This commit is contained in:
ml 2016-10-11 20:09:17 -07:00 committed by Markus Lampert
parent 892b2522d2
commit 0ae6a862db
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,13 +498,13 @@ def getLastToolLoad(obj):
parent = None
while parent is not None:
sibs = parent.Group
for g in sibs:
if isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool):
lastfound = g
if g == child:
tc = lastfound
if hasattr(parent, 'Group'):
sibs = parent.Group
for g in sibs:
if isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool):
lastfound = g
if g == child:
tc = lastfound
if tc is None:
try:
@ -533,7 +533,7 @@ def getToolControllers(obj):
except:
parent = None
if parent is not None:
if parent is not None and hasattr(parent, 'Group'):
sibs = parent.Group
for g in sibs:
if isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool):
@ -542,19 +542,22 @@ def getToolControllers(obj):
def getTool(obj, number=0):
"retrieves a tool from a hosting object with a tooltable, if any"
for o in obj.InList:
if o.TypeId == "Path::FeatureCompoundPython":
if hasattr(o, "Tooltable"):
return o.Tooltable.getTool(number)
return None
def findParentJob(obj):
'''retrieves a parent job object for an operation or other Path object'''
for i in obj.InList:
if isinstance(i.Proxy, PathScripts.PathJob.ObjectPathJob):
return i
if i.TypeId == "Path::FeaturePython":
grandParent = findParentJob(i)
if grandParent is not None:
return grandParent
return None
def getTool(obj, number=0):
"retrieves a tool from a hosting object with a tooltable, if any"
job = findParentJob(obj)
if job is not None:
return job.Tooltable.getTool(number)
return None
def GetJobs(jobname = None):