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

assembly: fix parts tracking for auto solving

Browse Source
This commit is contained in:
Zheng, Lei 2018-07-05 08:22:55 +08:00
parent f77de1de6f
commit e6bb489990
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
assembly.py
View File

@ -1420,7 +1420,6 @@ class Assembly(AsmGroup):
partMap[part] = self partMap[part] = self
for part in oldParts: for part in oldParts:
del partMap[part] del partMap[part]
return newParts
def execute(self,obj): def execute(self,obj):
self.constraints = None self.constraints = None
@ -1428,6 +1427,7 @@ class Assembly(AsmGroup):
System.touch(obj) System.touch(obj)
obj.ViewObject.Proxy.onExecute() obj.ViewObject.Proxy.onExecute()
# collect the part objects of this assembly
parts = set() parts = set()
partArrays = set() partArrays = set()
for cstr in self.getConstraints(): for cstr in self.getConstraints():
@ -1435,11 +1435,22 @@ class Assembly(AsmGroup):
info = element.Proxy.getInfo() info = element.Proxy.getInfo()
if isinstance(info.Part,tuple): if isinstance(info.Part,tuple):
partArrays.add(info.Part[0]) partArrays.add(info.Part[0])
parts.add(info.Part[0])
else: else:
parts.add(info.Part) parts.add(info.Part)
parts = self._collectParts(self.parts,parts,Assembly._PartMap)
partArrays = self._collectParts( # Update the global part object list for auto solving
self.partArrays,partArrays,Assembly._PartArrayMap) #
# Assembly._PartMap is used to track normal part object for change in
# its 'Placement'
#
# Assembly._PartArrayMap is for tracking link array for change in its
# 'PlacementList'
self._collectParts(self.parts,parts,Assembly._PartMap)
self.parts = parts
self._collectParts(self.partArrays,partArrays,Assembly._PartArrayMap)
self.partArrays = partArrays
return False # return False to call LinkBaseExtension::execute() return False # return False to call LinkBaseExtension::execute()