Issue #2811: Update content of Object node on creation moment

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

diff --git a/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
index 76a644c2a2c8835fd9faff89ddbb59ae5a183ab9..ffe7c5b25ab7d3cb87b6cbf04ce78ee7a6cd386b 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
@@ -94,7 +94,6 @@ void FeaturesPlugin_MultiTranslation::performOneDirection()
       anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
     if(!anObject.get()) { // may be for not-activated parts
-      eraseResults();
       return;
     }
     anObjects.push_back(anObject);
@@ -238,7 +237,6 @@ void FeaturesPlugin_MultiTranslation::performTwoDirection()
       anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
     if(!anObject.get()) { // may be for not-activated parts
-      eraseResults();
       return;
     }
     anObjects.push_back(anObject);
@@ -440,32 +438,24 @@ void FeaturesPlugin_MultiTranslation::loadNamingDS(
     std::shared_ptr<ModelAPI_ResultBody> theResultBody,
     std::shared_ptr<GeomAPI_Shape> theBaseShape)
 {
-  int aTag = 1;
-  int anIndex = 1;
-  std::string aTranslatedName;
-
   for (std::list<std::shared_ptr<GeomAlgoAPI_Translation> >::const_iterator anIt =
     theListOfTranslationAlgo.begin(); anIt != theListOfTranslationAlgo.cend(); ++anIt) {
-    std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = (*anIt)->mapOfSubShapes();
-
     // naming of faces
-    aTranslatedName = "Translated_Face_" + std::to_string((long long) anIndex);
-    theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::FACE,
-                                               aTag++, aTranslatedName, *aSubShapes.get(),
-                                               false, true);
+    theResultBody->loadModifiedShapes(*anIt,
+                                      theBaseShape,
+                                      GeomAPI_Shape::FACE,
+                                      "Translated_Face");
 
     // naming of edges
-    aTranslatedName = "Translated_Edge_" + std::to_string((long long) anIndex);
-    theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::EDGE,
-                                               aTag++, aTranslatedName, *aSubShapes.get(),
-                                               false, true);
+    theResultBody->loadModifiedShapes(*anIt,
+                                      theBaseShape,
+                                      GeomAPI_Shape::EDGE,
+                                      "Translated_Edge");
 
     // naming of vertex
-    aTranslatedName = "Translated_Vertex_" + std::to_string((long long) anIndex);
-    theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::VERTEX,
-                                               aTag++, aTranslatedName, *aSubShapes.get(),
-                                               false, true);
-
-    ++anIndex;
+    theResultBody->loadModifiedShapes(*anIt,
+                                      theBaseShape,
+                                      GeomAPI_Shape::VERTEX,
+                                      "Translated_Vertex");
   }
 }