Issue #3044: Undo list contains empty string for Load python script

[modules/shaper.git] / src / ModelHighAPI / ModelHighAPI_Services.cpp

diff --git a/src/ModelHighAPI/ModelHighAPI_Services.cpp b/src/ModelHighAPI/ModelHighAPI_Services.cpp
index 20e21e1b47af7ba811e9af87fef05d29f14981bc..21ab682485a7924b0b5d09a8cc1249e6ba4eb2c1 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Services.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Services.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "ModelHighAPI_Services.h"
@@ -28,6 +27,7 @@
 #include <ModelAPI_Events.h>
 
 #include <cmath>
+#include <sstream>
 
 //--------------------------------------------------------------------------------------
 std::shared_ptr<ModelAPI_Document> moduleDocument()
@@ -98,12 +98,26 @@ std::shared_ptr<ModelAPI_Result> standardPlane(const std::string & theName){
 //--------------------------------------------------------------------------------------
 void begin()
 {
-  ModelAPI_Session::get()->startOperation();
+  static int aTransactionID = 0;
+  std::ostringstream aTransactionName;
+  aTransactionName << "Operation_" << ++aTransactionID;
+  ModelAPI_Session::get()->startOperation(aTransactionName.str());
 }
 
 void end()
 {
+  // some operations make the current feature not the last one (like "galeries" change parameters)
+  DocumentPtr anActive = ModelAPI_Session::get()->activeDocument();
+  int aSize = anActive->size("Features");
+  if (aSize > 0) {
+    FeaturePtr aLastFeat =
+      std::dynamic_pointer_cast<ModelAPI_Feature>(anActive->object("Features", aSize - 1));
+    anActive->setCurrentFeature(aLastFeat, true);
+  }
+
   ModelAPI_Session::get()->finishOperation();
+  // issue #3044: clear undo/redo lists
+  ModelAPI_Session::get()->clearUndos();
   // to update data tree in the end of dumped script execution
   ModelAPI_EventCreator::get()->sendReordered(FeaturePtr());
 }
@@ -111,7 +125,7 @@ void apply()
 {
   auto aSession = ModelAPI_Session::get();
   aSession->finishOperation();
-  aSession->startOperation();
+  begin();
 }
 
 void updateFeatures()