From a8e32a0ed90e6451c878abdbe0bd58bb7229b8db Mon Sep 17 00:00:00 2001
From: "Zheng, Lei" <realthunder.dev@gmail.com>
Date: Sun, 19 May 2019 11:36:26 +0800
Subject: [PATCH] assembly: use signalBeforeCloseTransaction for auto solving

---
 assembly.py | 41 ++++++++---------------------------------
 gui.py      |  5 +++++
 mover.py    | 16 +++++++++++-----
 3 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/assembly.py b/assembly.py
index d09f21e..1ba815d 100644
--- a/assembly.py
+++ b/assembly.py
@@ -131,10 +131,10 @@ def sortChildren(obj,reverse):
     FreeCAD.setActiveTransaction('Sort children')
     try:
         editGroup(obj, [o[0] for o in group])
+        FreeCAD.closeActiveTransaction()
     except Exception:
         FreeCAD.closeActiveTransaction(True)
         raise
-    FreeCAD.closeActiveTransaction()
     if not touched:
         obj.purgeTouched()
 
@@ -2378,10 +2378,10 @@ class ViewProviderAsmConstraint(ViewProviderAsmGroup):
         FreeCAD.setActiveTransaction('Toggle constraint')
         try:
             obj.Disabled = not obj.Disabled
+            FreeCAD.closeActiveTransaction()
         except Exception:
             FreeCAD.closeActiveTransaction(True)
             raise
-        FreeCAD.closeActiveTransaction()
 
     def attach(self,vobj):
         super(ViewProviderAsmConstraint,self).attach(vobj)
@@ -3061,8 +3061,6 @@ BuildShapeNames = (BuildShapeNone,BuildShapeCompound,
 
 class Assembly(AsmGroup):
     _Busy = False
-    _Timer = QtCore.QTimer()
-    _TransID = 0
     _PartMap = {} # maps part to assembly
     _PartArrayMap = {} # maps array part to assembly
     _ScheduleTimer = QtCore.QTimer()
@@ -3180,28 +3178,19 @@ class Assembly(AsmGroup):
             cls.cancelAutoSolve()
             return
         if not force and cls._PendingSolve:
-            logger.debug('pending auto solve',frame=1)
             return
         if force or cls.canAutoSolve():
-            if not cls._Timer.isSingleShot():
-                cls._Timer.setSingleShot(True)
-                cls._Timer.timeout.connect(Assembly.onSolverTimer)
-            cls._TransID = FreeCAD.getActiveTransaction()
             logger.debug('auto solve scheduled on change of {}.{}',
                 objName(obj),prop,frame=1)
-            if cls._Busy:
-                cls._PendingSolve = True
-                return
-            cls._Timer.start(100)
+            cls._PendingSolve = True
 
     @classmethod
     def cancelAutoSolve(cls):
         logger.debug('cancel auto solve',frame=1)
-        cls._Timer.stop()
         cls._PendingSolve = False
 
     @classmethod
-    def onSolverTimer(cls):
+    def doAutoSolve(cls):
         canSolve = cls.canAutoSolve()
         if cls._Busy or not canSolve:
             cls._PendingSolve = canSolve
@@ -3210,18 +3199,9 @@ class Assembly(AsmGroup):
         cls.cancelAutoSolve()
 
         from . import solver
-        trans = cls._TransID and cls._TransID==FreeCAD.getActiveTransaction()
-        if not trans:
-            cls._TransID = 0
-            FreeCAD.setActiveTransaction('Assembly auto recompute')
         logger.debug('start solving...')
-        if not logger.catch('solver exception when auto recompute',
-                solver.solve, FreeCAD.ActiveDocument.Objects, True):
-            if not trans:
-                FreeCAD.closeActiveTransaction(True)
-        else:
-            if not trans:
-                FreeCAD.closeActiveTransaction()
+        logger.catch('solver exception when auto recompute',
+                solver.solve, FreeCAD.ActiveDocument.Objects, True)
         logger.debug('done solving')
 
     @classmethod
@@ -3250,17 +3230,11 @@ class Assembly(AsmGroup):
     def pauseSchedule(cls):
         cls._Busy = True
         cls._ScheduleTimer.stop()
-        if cls._Timer.isActive():
-            cls._PendingSolve = True
-            cls._Timer.stop()
 
     @classmethod
     def resumeSchedule(cls):
         cls._Busy = False
         cls.schedule()
-        if cls._PendingSolve:
-            cls._PendingSolve = False
-            cls._Timer.start(100)
 
     @classmethod
     def onSchedule(cls):
@@ -3460,6 +3434,7 @@ class Assembly(AsmGroup):
            FreeCAD.isRestoring():
             return
         if obj.Document and getattr(obj.Document,'Transacting',False):
+            System.onChanged(obj,prop)
             return
         if prop == 'BuildShape':
             self.buildShape()
@@ -3831,10 +3806,10 @@ class ViewProviderAssembly(ViewProviderAsmGroup):
         FreeCAD.setActiveTransaction('Freeze assembly')
         try:
             obj.Freeze = not obj.Freeze
+            FreeCAD.closeActiveTransaction()
         except Exception:
             FreeCAD.closeActiveTransaction(True)
             raise
-        FreeCAD.closeActiveTransaction()
 
     def attach(self,vobj):
         super(ViewProviderAssembly,self).attach(vobj)
diff --git a/gui.py b/gui.py
index 24f0c48..e994acc 100644
--- a/gui.py
+++ b/gui.py
@@ -658,6 +658,11 @@ class AsmCmdAutoElementVis(AsmCmdCheckable):
     @classmethod
     def Activated(cls,checked):
         super(AsmCmdAutoElementVis,cls).Activated(checked)
+        cls.setup()
+
+    @classmethod
+    def setup(cls):
+        checked = AsmCmdManager.AutoElementVis
         from .assembly import isTypeOf,AsmConstraint,\
             AsmElement,AsmElementLink,AsmElementGroup
         for doc in FreeCAD.listDocuments().values():
diff --git a/mover.py b/mover.py
index 4208d5f..01d10e5 100644
--- a/mover.py
+++ b/mover.py
@@ -396,16 +396,22 @@ class AsmDocumentObserver:
     def slotDeletedDocument(self,_doc):
         self.closeMover()
 
-    def slotUndoDocument(self,_doc):
+    def slotUndo(self):
         self.closeMover()
         AsmMovingPart.onRollback()
         Assembly.cancelAutoSolve()
+        gui.AsmCmdAutoElementVis.setup()
 
-    def slotRedoDocument(self,_doc):
-        self.slotUndoDocument(_doc)
+    def slotRedo(self):
+        self.slotUndo()
 
-    def slotAbortTransaction(self,_doc):
-        self.slotUndoDocument(_doc)
+    def slotBeforeCloseTransaction(self, abort):
+        if not abort:
+            Assembly.doAutoSolve()
+
+    def slotCloseTransaction(self, abort):
+        if abort:
+            self.slotUndo()
 
     def slotChangedObject(self,obj,prop):
         Assembly.checkPartChange(obj,prop)