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

assembly: touch constraint group on child order change

Browse Source
This commit is contained in:
Zheng, Lei 2019-05-03 11:54:48 +08:00
parent f7041b1625
commit 06a73f83ef
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
assembly.py
View File

@ -75,16 +75,28 @@ def flattenGroup(obj):
return obj.Group return obj.Group
return group return group
def editGroup(obj,children): def editGroup(obj,children,notouch=None):
change = None change = None
if 'Immutable' in obj.getPropertyStatus('Group'): if 'Immutable' in obj.getPropertyStatus('Group'):
change = '-Immutable' change = '-Immutable'
revert = 'Immutable' revert = 'Immutable'
parent = getattr(obj,'_Parent',None) parent = getattr(obj,'_Parent',None)
if parent and 'Touched' in parent.State: if parent and 'Touched' in parent.State:
parent = None parent = None
notouch = getattr(obj,'NoTouch',True)
if not notouch: if not hasattr(obj,'NoTouch'):
notouch = False
elif notouch is None:
if (isTypeOf(parent,AsmConstraintGroup) or \
isTypeOf(obj,AsmConstraintGroup)):
# the order inside constraint group actually matters, so do not
# engage no touch
parent = None
else:
notouch = not obj.NoTouch
if notouch:
obj.NoTouch = True obj.NoTouch = True
block = gui.AsmCmdManager.AutoRecompute block = gui.AsmCmdManager.AutoRecompute
if block: if block:
@ -98,7 +110,7 @@ def editGroup(obj,children):
obj.setPropertyStatus('Group',revert) obj.setPropertyStatus('Group',revert)
if block: if block:
gui.AsmCmdManager.AutoRecompute = True gui.AsmCmdManager.AutoRecompute = True
if not notouch: if notouch:
obj.NoTouch = False obj.NoTouch = False
if parent: if parent:
parent.purgeTouched() parent.purgeTouched()
@ -4148,15 +4160,17 @@ class AsmPlainGroup(object):
AsmPlainGroup(obj,info.Parent) AsmPlainGroup(obj,info.Parent)
ViewProviderAsmPlainGroup(obj.ViewObject) ViewProviderAsmPlainGroup(obj.ViewObject)
group = info.Group.Group group = info.Group.Group
idx = min([ group.index(o) for o in info.Objects ]) indices = [ group.index(o) for o in info.Objects ]
child = group[idx] indices.sort()
child = group[indices[0]]
group = [ o for o in info.Group.Group group = [ o for o in info.Group.Group
if o not in info.Objects ] if o not in info.Objects ]
group.insert(idx,obj) group.insert(indices[0],obj)
editGroup(info.Group,group) notouch = indices[-1] == indices[0]+len(indices)-1
editGroup(info.Group,group,notouch)
obj.purgeTouched() obj.purgeTouched()
editGroup(obj,info.Objects) editGroup(obj,info.Objects,notouch)
if undo: if undo:
FreeCAD.closeActiveTransaction() FreeCAD.closeActiveTransaction()
@ -4196,8 +4210,8 @@ class ViewProviderAsmPlainGroup(object):
children = group.Group children = group.Group
idx = children.index(obj) idx = children.index(obj)
children = children[:idx] + obj.Group + children[idx+1:] children = children[:idx] + obj.Group + children[idx+1:]
editGroup(obj,[]) editGroup(obj,[],True)
editGroup(group,children) editGroup(group,children,True)
return True return True
def setupContextMenu(self,_vobj,menu): def setupContextMenu(self,_vobj,menu):