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

assembly: fix stray relations when deleting assembly

Browse Source
This commit is contained in:
Zheng, Lei 2021-01-05 14:16:10 +08:00
parent fe6a792202
commit c6f6c481d2
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
freecad/asm3/assembly.py
View File

@ -3085,15 +3085,13 @@ class AsmRelationGroup(AsmBase):
super(AsmRelationGroup,self).__init__() super(AsmRelationGroup,self).__init__()
def attach(self,obj): def attach(self,obj):
# AsmRelationGroup do not install LinkBaseExtension
# obj.addExtension('App::LinkBaseExtensionPython', None)
obj.addProperty('App::PropertyLinkList','Group','') obj.addProperty('App::PropertyLinkList','Group','')
obj.setPropertyStatus('Group','Hidden') obj.setPropertyStatus('Group','Hidden')
obj.addProperty('App::PropertyLink','Constraints','') obj.addProperty('App::PropertyLink','Constraints','')
# this is to make sure relations are recomputed after all constraints # this is to make sure relations are recomputed after all constraints
obj.Constraints = self.parent.getConstraintGroup() obj.Constraints = self.parent.getConstraintGroup()
obj.setPropertyStatus('Constraints',('Hidden','Immutable')) obj.setPropertyStatus('Constraints',('Hidden','Immutable'))
self.linkSetup(obj) self.linkSetup(obj)
def getViewProviderName(self,_obj): def getViewProviderName(self,_obj):
@ -3101,6 +3099,20 @@ class AsmRelationGroup(AsmBase):
def linkSetup(self,obj): def linkSetup(self,obj):
super(AsmRelationGroup,self).linkSetup(obj) super(AsmRelationGroup,self).linkSetup(obj)
# AsmRelationGroup used to not having the LinkBaseExtension for
# the sake of simplicity. It is added now to make it a LinkGroup so that
# its children can be auto deleted by setting GroupMode to 1
if not obj.hasExtension('App::LinkBaseExtensionPython'):
obj.addExtension('App::LinkBaseExtensionPython', None)
obj.addProperty("App::PropertyEnumeration","GroupMode","Base",'')
obj.configLinkProperty(ElementList='Group', LinkMode='GroupMode')
obj.GroupMode = 1 # auto delete children
obj.setPropertyStatus('GroupMode',
('Hidden','Immutable','Transient'))
else:
obj.configLinkProperty(ElementList='Group', LinkMode='GroupMode')
for o in obj.Group: for o in obj.Group:
o.Proxy.parent = self o.Proxy.parent = self
if o.Count: if o.Count:
@ -3517,9 +3529,6 @@ class ViewProviderAsmRelation(ViewProviderAsmBase):
def canDropObjects(self): def canDropObjects(self):
return False return False
def onDelete(self,_vobj,_subs):
return False
def canDelete(self,_obj): def canDelete(self,_obj):
return True return True