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

assembly: fix undo handling when multiply constraint

Browse Source
This commit is contained in:
Zheng, Lei 2020-04-07 16:50:10 +08:00
parent 28d2df2c3d
commit 68d31787ce
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
freecad/asm3/assembly.py
View File

@ -1636,8 +1636,11 @@ class AsmElementLink(AsmBase):
obj.setPropertyStatus('LinkTransform',['Immutable','Hidden']) obj.setPropertyStatus('LinkTransform',['Immutable','Hidden'])
obj.configLinkProperty('LinkedObject','Placement','LinkTransform') obj.configLinkProperty('LinkedObject','Placement','LinkTransform')
if hasProperty(obj,'Count'): if hasProperty(obj,'Count'):
obj.configLinkProperty('PlacementList', obj.configLinkProperty(ElementCount='Count')
'ShowElement',ElementCount='Count') if hasProperty(obj,'PlacementList'):
obj.configLinkProperty('PlacementList')
if hasProperty(obj,'ShowElement'):
obj.configLinkProperty('ShowElement')
self.info = None self.info = None
self.infos = [] self.infos = []
self.part = None self.part = None
@ -2130,6 +2133,10 @@ class AsmConstraint(AsmGroup):
def onChanged(self,obj,prop): def onChanged(self,obj,prop):
if obj.Document and getattr(obj.Document,'Transacting',False): if obj.Document and getattr(obj.Document,'Transacting',False):
Constraint.onChanged(obj,prop) Constraint.onChanged(obj,prop)
if prop == 'Multiply' and not obj.Multiply:
children = obj.Group
if children and hasattr(children[0],'Count'):
children[0].Count = 0
return return
if not obj.Removing and prop not in _IgnoredProperties: if not obj.Removing and prop not in _IgnoredProperties:
if prop == Constraint.propMultiply() and not FreeCAD.isRestoring(): if prop == Constraint.propMultiply() and not FreeCAD.isRestoring():
@ -2224,16 +2231,23 @@ class AsmConstraint(AsmGroup):
if not hasProperty(firstChild,'Count'): if not hasProperty(firstChild,'Count'):
firstChild.addProperty("App::PropertyInteger","Count",'','') firstChild.addProperty("App::PropertyInteger","Count",'','')
firstChild.setPropertyStatus('Count','ReadOnly') firstChild.setPropertyStatus('Count','ReadOnly')
firstChild.configLinkProperty(ElementCount='Count')
if not hasProperty(firstChild,'AutoCount'):
firstChild.addProperty("App::PropertyBool","AutoCount",'', firstChild.addProperty("App::PropertyBool","AutoCount",'',
'Auto change part count to match constraining elements') 'Auto change part count to match constraining elements')
firstChild.AutoCount = True firstChild.AutoCount = True
if not hasProperty(firstChild,'PlacementList'):
firstChild.addProperty("App::PropertyPlacementList", firstChild.addProperty("App::PropertyPlacementList",
"PlacementList",'','') "PlacementList",'','')
firstChild.setPropertyStatus('PlacementList','Output') firstChild.setPropertyStatus('PlacementList','Output')
firstChild.configLinkProperty('PlacementList')
if not hasProperty(firstChild,'ShowElement'):
firstChild.addProperty("App::PropertyBool","ShowElement",'','') firstChild.addProperty("App::PropertyBool","ShowElement",'','')
firstChild.setPropertyStatus('ShowElement',('Hidden','Immutable')) firstChild.setPropertyStatus('ShowElement',('Hidden','Immutable'))
firstChild.configLinkProperty('PlacementList', firstChild.configLinkProperty('ShowElement')
'ShowElement',ElementCount='Count')
if firstChild.AutoCount: if firstChild.AutoCount:
oldCount = getLinkProperty(info.Part[0],'ElementCount',None,True) oldCount = getLinkProperty(info.Part[0],'ElementCount',None,True)
@ -2317,9 +2331,9 @@ class AsmConstraint(AsmGroup):
count -= finished count -= finished
if count: if count:
distMap.sort() distMap.sort()
logger.debug('distance map: {}',len(distMap)) # logger.debug('distance map: {}',len(distMap))
for d in distMap: # for d in distMap:
logger.debug(d) # logger.debug(d)
for d,i,j in distMap: for d,i,j in distMap:
if used[i]>=0 or order[j]: if used[i]>=0 or order[j]:
continue continue