COrrect management of nested transactions

diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index 806709ff24003c099fe34a4a2aa76840acbe7ac2..e8f481409dd410ef31672b2020ff7dd895af62ed 100644 (file)
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -161,6 +161,11 @@ bool Model_Document::save(const char* theFileName)
 
 void Model_Document::close()
 {
+  boost::shared_ptr<ModelAPI_PluginManager> aPM = Model_PluginManager::get();
+  if (this != aPM->rootDocument().get() && 
+      this == aPM->currentDocument().get()) {
+    aPM->setCurrentDocument(aPM->rootDocument());
+  }
   // close all subs
   set<string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
@@ -174,12 +179,15 @@ void Model_Document::close()
 
 void Model_Document::startOperation()
 {
-  // check is it nested or not
-  if (myDoc->HasOpenCommand()) {
-    myNestedStart = myTransactionsAfterSave;
+  if (myDoc->HasOpenCommand()) { // start of nested command
+    if (myNestedNum == -1) {
+      myNestedNum = 0;
+      myDoc->InitDeltaCompaction();
+    }
+    myDoc->NewCommand();
+  } else { // start of simple command
+    myDoc->NewCommand();
   }
-  // new command for this
-  myDoc->OpenCommand();
   // new command for all subs
   set<string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
@@ -188,11 +196,26 @@ void Model_Document::startOperation()
 
 void Model_Document::finishOperation()
 {
-  if (myNestedStart > myTransactionsAfterSave) // this nested transaction is owervritten
-    myNestedStart = 0;
-  // returns false if delta is empty and no transaction was made
-  myIsEmptyTr[myTransactionsAfterSave] = !myDoc->CommitCommand();
-  myTransactionsAfterSave++;
+  if (myNestedNum != -1) // this nested transaction is owervritten
+    myNestedNum++;
+  if (!myDoc->HasOpenCommand()) {
+    if (myNestedNum != -1) {
+      myNestedNum -= 2; // one is just incremented before, one is left (and not empty!)
+      while(myNestedNum != -1) {
+        myIsEmptyTr.erase(myTransactionsAfterSave);
+        myTransactionsAfterSave--;
+        myNestedNum--;
+      }
+      myIsEmptyTr[myTransactionsAfterSave] = false;
+      myTransactionsAfterSave++;
+      myDoc->PerformDeltaCompaction();
+    }
+  } else {
+    // returns false if delta is empty and no transaction was made
+    myIsEmptyTr[myTransactionsAfterSave] = !myDoc->CommitCommand() && (myNestedNum == -1);
+    myTransactionsAfterSave++;
+  }
+
   // finish for all subs
   set<string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
@@ -201,6 +224,8 @@ void Model_Document::finishOperation()
 
 void Model_Document::abortOperation()
 {
+  if (myNestedNum == 0)
+    myNestedNum = -1;
   myDoc->AbortCommand();
   synchronizeFeatures();
   // abort for all subs
@@ -212,7 +237,7 @@ void Model_Document::abortOperation()
 bool Model_Document::isOperation()
 {
   // operation is opened for all documents: no need to check subs
-  return myDoc->HasOpenCommand() == Standard_True ;
+  return myDoc->HasOpenCommand() == Standard_True;
 }
 
 bool Model_Document::isModified()
@@ -223,7 +248,7 @@ bool Model_Document::isModified()
 
 bool Model_Document::canUndo()
 {
-  if (myDoc->GetAvailableUndos() > 0 && myNestedStart != myTransactionsAfterSave)
+  if (myDoc->GetAvailableUndos() > 0 && myNestedNum != 0 && myTransactionsAfterSave != 0 /* for omitting the first useless transaction */)
     return true;
   // check other subs contains operation that can be undoed
   set<string>::iterator aSubIter = mySubs.begin();
@@ -236,6 +261,7 @@ bool Model_Document::canUndo()
 void Model_Document::undo()
 {
   myTransactionsAfterSave--;
+  if (myNestedNum > 0) myNestedNum--;
   if (!myIsEmptyTr[myTransactionsAfterSave])
     myDoc->Undo();
   synchronizeFeatures();
@@ -259,6 +285,7 @@ bool Model_Document::canRedo()
 
 void Model_Document::redo()
 {
+  if (myNestedNum != -1) myNestedNum++;
   if (!myIsEmptyTr[myTransactionsAfterSave])
     myDoc->Redo();
   myTransactionsAfterSave++;
@@ -458,10 +485,13 @@ Model_Document::Model_Document(const std::string theID)
 {
   myDoc->SetUndoLimit(UNDO_LIMIT);
   myTransactionsAfterSave = 0;
-  myNestedStart = 0;
-  myDoc->SetNestedTransactionMode();
+  myNestedNum = -1;
+  //myDoc->SetNestedTransactionMode();
   // to have something in the document and avoid empty doc open/save problem
+  // in transaction for nesting correct working
+  myDoc->NewCommand();
   TDataStd_Integer::Set(myDoc->Main().Father(), 0);
+  myDoc->CommitCommand();
 }
 
 TDF_Label Model_Document::groupLabel(const string theGroup)

diff --git a/src/Model/Model_Document.h b/src/Model/Model_Document.h
index b1945bae1eb878d7df5615b07e3ef4c6781d33c1..d8fee7e01f5a1978090b0ea29c250512ab8cfd16 100644 (file)
--- a/src/Model/Model_Document.h
+++ b/src/Model/Model_Document.h
@@ -118,8 +118,8 @@ private:
   Handle_TDocStd_Document myDoc; ///< OCAF document
   /// number of transactions after the last "save" call, used for "IsModified" method
   int myTransactionsAfterSave;
-  /// number of myTransactionsAfterSave for the nested transaction start
-  int myNestedStart;
+  /// number of nested transactions performed (or -1 if not nested)
+  int myNestedNum;
   /// All features managed by this document (not only in history of OB)
   std::vector<boost::shared_ptr<ModelAPI_Feature> > myFeatures;