Copyright update 2021

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

diff --git a/src/ModelHighAPI/ModelHighAPI_Services.cpp b/src/ModelHighAPI/ModelHighAPI_Services.cpp
index c9be661299b85665b84e2e1d6a438e602fa96d3b..09dea983c9743077e5e0a2631f7588b8d54b8e49 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Services.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Services.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021  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
@@ -27,6 +27,7 @@
 #include <ModelAPI_Events.h>
 
 #include <cmath>
+#include <sstream>
 
 //--------------------------------------------------------------------------------------
 std::shared_ptr<ModelAPI_Document> moduleDocument()
@@ -41,17 +42,17 @@ std::shared_ptr<ModelAPI_Document> activeDocument()
 }
 
 //--------------------------------------------------------------------------------------
-std::shared_ptr<GeomAPI_Ax3> defaultPlane( const std::string& theName )
+std::shared_ptr<GeomAPI_Ax3> defaultPlane( const std::wstring& theName )
 {
   std::shared_ptr<GeomAPI_Pnt> o(new GeomAPI_Pnt(0, 0, 0));
   std::shared_ptr<GeomAPI_Dir> n, x;
-  if (theName == "XOY") {
+  if (theName == L"XOY") {
       n.reset(new GeomAPI_Dir(0, 0, 1));
       x.reset(new GeomAPI_Dir(1, 0, 0));
-  } else if (theName == "XOZ") {
+  } else if (theName == L"XOZ") {
       n.reset(new GeomAPI_Dir(0, -1, 0));
       x.reset(new GeomAPI_Dir(1, 0, 0));
-  } else if (theName == "YOZ") {
+  } else if (theName == L"YOZ") {
       n.reset(new GeomAPI_Dir(1, 0, 0));
       x.reset(new GeomAPI_Dir(0, 1, 0));
   }
@@ -59,35 +60,35 @@ std::shared_ptr<GeomAPI_Ax3> defaultPlane( const std::string& theName )
   return std::shared_ptr<GeomAPI_Ax3>(new GeomAPI_Ax3(o, x, n));
 }
 
-std::string defaultPlane(const std::shared_ptr<GeomAPI_Pnt>& theOrigin,
+std::wstring defaultPlane(const std::shared_ptr<GeomAPI_Pnt>& theOrigin,
                          const std::shared_ptr<GeomAPI_Dir>& theNormal,
                          const std::shared_ptr<GeomAPI_Dir>& theDirX)
 {
   static const double aTol = 1.e-10;
 
   if (fabs(theOrigin->x()) > aTol || fabs(theOrigin->y()) > aTol || fabs(theOrigin->z()) > aTol)
-    return std::string();
+    return std::wstring();
 
   // XOY or XOZ
   if (fabs(theNormal->x()) < aTol &&
       fabs(theDirX->x() - 1.0) < aTol && fabs(theDirX->y()) < aTol && fabs(theDirX->z()) < aTol) {
     // XOY
     if (fabs(theNormal->y()) < aTol && fabs(theNormal->z() - 1.0) < aTol)
-      return std::string("XOY");
+      return std::wstring(L"XOY");
     else if (fabs(theNormal->y() + 1.0) < aTol && fabs(theNormal->z()) < aTol)
-      return std::string("XOZ");
+      return std::wstring(L"XOZ");
   }
   // YOZ
   else if (fabs(theNormal->x() - 1.0) < aTol &&
            fabs(theNormal->y()) < aTol && fabs(theNormal->z()) < aTol &&
            fabs(theDirX->x()) < aTol && fabs(theDirX->y() - 1.0) < aTol &&
            fabs(theDirX->z()) < aTol)
-    return std::string("YOZ");
+    return std::wstring(L"YOZ");
 
-  return std::string();
+  return std::wstring();
 }
 
-std::shared_ptr<ModelAPI_Result> standardPlane(const std::string & theName){
+std::shared_ptr<ModelAPI_Result> standardPlane(const std::wstring & theName){
   DocumentPtr aPartSet = ModelAPI_Session::get()->moduleDocument();
   // searching for the construction element
   return std::dynamic_pointer_cast<ModelAPI_Result>(
@@ -97,7 +98,17 @@ std::shared_ptr<ModelAPI_Result> standardPlane(const std::string & theName){
 //--------------------------------------------------------------------------------------
 void begin()
 {
-  ModelAPI_Session::get()->startOperation();
+  static int aTransactionID = 0;
+  static int aNbTransactions = -1;
+  int aNbUndo = (int)ModelAPI_Session::get()->undoList().size();
+  if (aNbUndo != aNbTransactions) {
+    // the last transaction was not empty, thus increase the ID
+    aNbTransactions = aNbUndo;
+    ++aTransactionID;
+  }
+  std::ostringstream aTransactionName;
+  aTransactionName << "Operation_" << aTransactionID;
+  ModelAPI_Session::get()->startOperation(aTransactionName.str());
 }
 
 void end()
@@ -119,7 +130,8 @@ void apply()
 {
   auto aSession = ModelAPI_Session::get();
   aSession->finishOperation();
-  aSession->startOperation();
+  // start the next operation
+  begin();
 }
 
 void updateFeatures()