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

assembly: fix handling of undo/redo

Browse Source
This commit is contained in:
Zheng, Lei 2019-04-12 12:48:24 +08:00
parent 1a96bb2805
commit 5b2583cddc
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
assembly.py
View File

@ -280,7 +280,9 @@ class AsmPartGroup(AsmGroup):
return 1 if self.getAssembly().frozen else 0 return 1 if self.getAssembly().frozen else 0
def onChanged(self,obj,prop): def onChanged(self,obj,prop):
if obj.Removing or FreeCAD.isRestoring(): if obj.Removing or FreeCAD.isRestoring() :
return
if obj.Document and getattr(obj.Document,'Transacting',False):
return return
if prop == 'DerivedFrom': if prop == 'DerivedFrom':
self.checkDerivedParts() self.checkDerivedParts()
@ -481,6 +483,10 @@ class AsmElement(AsmBase):
parent = getattr(self,'parent',None) parent = getattr(self,'parent',None)
if not parent or obj.Removing or FreeCAD.isRestoring(): if not parent or obj.Removing or FreeCAD.isRestoring():
return return
if obj.Document and getattr(obj.Document,'Transacting',False):
if prop == 'Label':
parent.Object.cacheChildLabel()
return
if prop=='Offset': if prop=='Offset':
self.updatePlacement() self.updatePlacement()
return return
@ -1282,10 +1288,17 @@ class AsmElementLink(AsmBase):
not getattr(self,'parent',None) or \ not getattr(self,'parent',None) or \
FreeCAD.isRestoring(): FreeCAD.isRestoring():
return return
if obj.Document and getattr(obj.Document,'Transacting',False):
self.infos *= 0 # clear the list
self.info = None
return
if prop == 'Count': if prop == 'Count':
self.infos *= 0 # clear the list self.infos *= 0 # clear the list
self.info = None self.info = None
return return
if prop == 'Offset':
self.getInfo(True)
return
if prop == 'NoExpand': if prop == 'NoExpand':
cstr = self.parent.Object cstr = self.parent.Object
if obj!=flattenGroup(cstr)[0] \ if obj!=flattenGroup(cstr)[0] \
@ -1294,9 +1307,6 @@ class AsmElementLink(AsmBase):
self.setLink(self.getAssembly().getPartGroup(), self.setLink(self.getAssembly().getPartGroup(),
self.getElementSubname(True)) self.getElementSubname(True))
return return
if prop == 'Offset':
self.getInfo(True)
return
if prop == 'Label': if prop == 'Label':
if obj.Document and getattr(obj.Document,'Transacting',False): if obj.Document and getattr(obj.Document,'Transacting',False):
return return
@ -1652,6 +1662,8 @@ class AsmConstraint(AsmGroup):
Constraint.setDisable(obj) Constraint.setDisable(obj)
def onChanged(self,obj,prop): def onChanged(self,obj,prop):
if obj.Document and getattr(obj.Document,'Transacting',False):
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():
self.checkMultiply() self.checkMultiply()
@ -2299,6 +2311,8 @@ class AsmConstraintGroup(AsmGroup):
def onChanged(self,obj,prop): def onChanged(self,obj,prop):
if obj.Removing or FreeCAD.isRestoring(): if obj.Removing or FreeCAD.isRestoring():
return return
if obj.Document and getattr(obj.Document,'Transacting',False):
return
if prop not in _IgnoredProperties: if prop not in _IgnoredProperties:
System.onChanged(obj,prop) System.onChanged(obj,prop)
Assembly.autoSolve(obj,prop) Assembly.autoSolve(obj,prop)
@ -3263,6 +3277,8 @@ class Assembly(AsmGroup):
not getattr(self,'Object',None) or \ not getattr(self,'Object',None) or \
FreeCAD.isRestoring(): FreeCAD.isRestoring():
return return
if obj.Document and getattr(obj.Document,'Transacting',False):
return
if prop == 'BuildShape': if prop == 'BuildShape':
self.buildShape() self.buildShape()
return return