#1707 Fatal error when Recover box

[modules/shaper.git] / src / FeaturesPlugin / FeaturesPlugin_Partition.cpp

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp b/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp
index a105bd1db8f71b1d0670cd959411c1d6c0a9aa67..4e84bef15a1df03452186b6c29365aaebd3dedde 100755 (executable)
--- a/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp
@@ -23,6 +23,7 @@
 #include <GeomAlgoAPI_MakeShapeList.h>
 #include <GeomAlgoAPI_ShapeTools.h>
 
+#include <GeomAPI_Face.h>
 #include <GeomAPI_ShapeIterator.h>
 
 #include <sstream>
@@ -143,7 +144,7 @@ void FeaturesPlugin_Partition::storeResult(const ListOfShape& theObjects,
   ResultBodyPtr aResultBody = document()->createBody(data(), theIndex);
 
   // Store modified shape.
-  if(aBaseShape->isEqual(theResultShape)) {
+  if(!aBaseShape.get() || aBaseShape->isEqual(theResultShape)) {
     aResultBody->store(theResultShape);
     setResult(aResultBody, theIndex);
     return;
@@ -159,15 +160,16 @@ void FeaturesPlugin_Partition::storeResult(const ListOfShape& theObjects,
   std::shared_ptr<GeomAPI_DataMapOfShapeShape> aMapOfSubShapes = theMakeShape->mapOfSubShapes();
   int anIndex = 1;
   for(ListOfShape::const_iterator anIt = theObjects.cbegin(); anIt != theObjects.cend(); ++anIt) {
-    std::ostringstream aStream;
-    aStream << aModName << "_" << anIndex++;
+    std::string aModEdgeName = aModName + "_Edge_" + std::to_string((long long)anIndex);
+    std::string aModFaceName = aModName + "_Face_" + std::to_string((long long)anIndex++);
     aResultBody->loadAndOrientModifiedShapes(theMakeShape.get(), *anIt, GeomAPI_Shape::EDGE,
-                                             aModTag, aStream.str(), *aMapOfSubShapes.get(), true);
+                                             aModTag, aModEdgeName, *aMapOfSubShapes.get(), true);
+    aModTag += 1000;
     aResultBody->loadAndOrientModifiedShapes(theMakeShape.get(), *anIt, GeomAPI_Shape::FACE,
-                                             aModTag, aStream.str(), *aMapOfSubShapes.get(), true);
+                                             aModTag, aModFaceName, *aMapOfSubShapes.get(), true);
+    aModTag += 1000;
     aResultBody->loadDeletedShapes(theMakeShape.get(), *anIt, GeomAPI_Shape::EDGE, aDelTag);
     aResultBody->loadDeletedShapes(theMakeShape.get(), *anIt, GeomAPI_Shape::FACE, aDelTag);
-    aModTag += 10000;
   }
 
   setResult(aResultBody, theIndex);