Incorrect dumping of parts with user-defined names (issue #1804)

[modules/shaper.git] / src / PartSetPlugin / PartSetPlugin_Duplicate.cpp

diff --git a/src/PartSetPlugin/PartSetPlugin_Duplicate.cpp b/src/PartSetPlugin/PartSetPlugin_Duplicate.cpp
index 35134c64b7aa2a43603aebea9975e7d6bc8f2b5c..7b3e303d7e9738a94e5d6a467ca71dac4933c272 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Duplicate.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Duplicate.cpp
@@ -5,6 +5,7 @@
 // Author:      Mikhail PONIKAROV
 
 #include "PartSetPlugin_Duplicate.h"
+#include "PartSetPlugin_Part.h"
 #include <ModelAPI_AttributeRefAttr.h>
 #include <ModelAPI_AttributeDocRef.h>
 #include <ModelAPI_Data.h>
@@ -14,14 +15,8 @@
 
 using namespace std;
 
-PartSetPlugin_Duplicate::PartSetPlugin_Duplicate()
-{
-}
-
-void PartSetPlugin_Duplicate::initAttributes()
+void PartSetPlugin_Duplicate::execute()
 {
-  PartSetPlugin_Part::initAttributes();
-
   std::shared_ptr<ModelAPI_Session> aPManager = ModelAPI_Session::get();
   std::shared_ptr<ModelAPI_Document> aRoot = aPManager->moduleDocument();
   std::shared_ptr<ModelAPI_ResultPart> aSource;  // searching for source document attribute
@@ -34,15 +29,12 @@ void PartSetPlugin_Duplicate::initAttributes()
     aSource.reset();
   }
   if (aSource) {
+    // create a new Part feature
+    FeaturePtr aNewPart = aRoot->addFeature(PartSetPlugin_Part::ID(), false);
+    aNewPart->execute(); // to make result and generate a unique name
+
     std::shared_ptr<ModelAPI_Document> aCopy = aPManager->copy(
-        aSource->data()->document(ModelAPI_ResultPart::DOC_REF())->value(), data()->name());
-  } else { // invalid part copy: do nothing, keep this in empty name
-    data()->setName("");
+      aSource->data()->document(ModelAPI_ResultPart::DOC_REF())->value(),
+      std::dynamic_pointer_cast<ModelAPI_ResultPart>(aNewPart->firstResult())->partDoc()->id());
   }
 }
-
-void PartSetPlugin_Duplicate::execute()
-{
-  if (!data()->name().empty())
-    PartSetPlugin_Part::execute();
-}