Issues #198 #118 "Remove" and "Duplicate" features corrected to be correctrly process...

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

diff --git a/src/PartSetPlugin/PartSetPlugin_Part.cpp b/src/PartSetPlugin/PartSetPlugin_Part.cpp
index ebd970ca510786a3f23567e91de0546c23bcfaf3..9c5e6e62a93e4ef8cb0956dd2fe4ffbb2716d6a0 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Part.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Part.cpp
@@ -3,7 +3,7 @@
 // Author:      Mikhail PONIKAROV
 
 #include "PartSetPlugin_Part.h"
-#include "ModelAPI_PluginManager.h"
+#include "ModelAPI_Session.h"
 #include "ModelAPI_Document.h"
 #include "ModelAPI_Data.h"
 #include "ModelAPI_AttributeDocRef.h"
@@ -16,27 +16,30 @@ PartSetPlugin_Part::PartSetPlugin_Part()
 }
 
 void PartSetPlugin_Part::initAttributes()
-{
-  data()->addAttribute(PART_ATTR_DOC_REF, ModelAPI_AttributeDocRef::type());
+{  // all is in part result
 }
 
-void PartSetPlugin_Part::execute() 
+void PartSetPlugin_Part::execute()
 {
-  boost::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = data()->docRef(PART_ATTR_DOC_REF);
-  if (!aDocRef->value()) { // create a document if not yet created
-    boost::shared_ptr<ModelAPI_Document> aPartSetDoc = 
-      ModelAPI_PluginManager::get()->rootDocument();
-    aDocRef->setValue(aPartSetDoc->subDocument(data()->name()));
+  ResultPartPtr aResult = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(firstResult());
+  if (!aResult) {
+    aResult = document()->createPart(data());
+    setResult(aResult);
+    aResult->activate();
   }
-  // create a result only once
-  if (results().empty()) {
-    boost::shared_ptr<ModelAPI_ResultPart> aResult = document()->createPart();
-    document()->storeResult(data(), aResult);
-    if (aResult->data()->name().empty())
-      aResult->data()->setName(data()->name());
+  /*
+  boost::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = aResult->data()->docRef(
+      ModelAPI_ResultPart::DOC_REF());
+  
+  if (!aDocRef->value()) {  // create a document if not yet created
+    boost::shared_ptr<ModelAPI_Document> aPartSetDoc =
+        ModelAPI_Session::get()->moduleDocument();
+    aDocRef->setValue(aPartSetDoc->subDocument(data()->name()));
   }
+  */
 }
 
-boost::shared_ptr<ModelAPI_Document> PartSetPlugin_Part::documentToAdd() {
-  return ModelAPI_PluginManager::get()->rootDocument();
+boost::shared_ptr<ModelAPI_Document> PartSetPlugin_Part::documentToAdd()
+{
+  return ModelAPI_Session::get()->moduleDocument();
 }