X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSetPlugin%2FPartSetPlugin_Part.cpp;h=6691f20faf5981a5fc70c44c30fc4c8901a92343;hb=42dfdea5422ab72d81c36155b4c6f352c85c1110;hp=95fa5f06bee10875028b822faaf7c3e3bc11a62b;hpb=6bb3ec6c114b55c02bad00ec953cd5b867eb7083;p=modules%2Fshaper.git

diff --git a/src/PartSetPlugin/PartSetPlugin_Part.cpp b/src/PartSetPlugin/PartSetPlugin_Part.cpp
index 95fa5f06b..6691f20fa 100644
--- a/src/PartSetPlugin/PartSetPlugin_Part.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Part.cpp
@@ -10,6 +10,7 @@
 #include "ModelAPI_Data.h"
 #include "ModelAPI_AttributeDocRef.h"
 #include <ModelAPI_ResultPart.h>
+#include <ModelAPI_Events.h>
 
 using namespace std;
 
@@ -27,7 +28,19 @@ void PartSetPlugin_Part::execute()
   if (!aResult) {
     aResult = document()->createPart(data());
     setResult(aResult);
-    aResult->activate();
+    // do not activate part by simple execution if it is not loaded yet: it must be explicitly
+    // activated for this
+    if (!ModelAPI_Session::get()->isLoadByDemand(aResult->data()->name())) {
+      // On undo/redo creation of the part result the Object Borwser must get creation event
+      // earlier that activation of this part event (otherwise the crash is producted)
+      // So, send a creation event earlier, without any grouping
+      static Events_ID aCreateID = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
+      ModelAPI_EventCreator::get()->sendUpdated(aResult, aCreateID, false);
+
+      aResult->activate();
+    }
+  } else { // execute is called for result update anyway
+    aResult->updateShape();
   }
 }
 
@@ -36,3 +49,69 @@ const std::string& PartSetPlugin_Part::documentToAdd()
   // part must be added only to the module document
   return ModelAPI_Session::get()->moduleDocument()->kind();
 }
+
+std::shared_ptr<ModelAPI_Feature> PartSetPlugin_Part::addFeature(std::string theID)
+{
+  ResultPartPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultPart>(firstResult());
+  if (aResult.get()) {
+    DocumentPtr aDoc = aResult->partDoc();
+    if (aDoc.get() && aDoc->isOpened())
+      return aDoc->addFeature(theID);
+  }
+  return FeaturePtr();
+}
+
+int PartSetPlugin_Part::numberOfSubs(bool forTree) const
+{
+  ResultPartPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultPart>(firstResult());
+  if (aResult.get()) {
+    DocumentPtr aDoc = aResult->partDoc();
+    if (aDoc.get() && aDoc->isOpened())
+      return aDoc->numInternalFeatures();
+  }
+  return 0;
+}
+
+std::shared_ptr<ModelAPI_Feature> PartSetPlugin_Part::subFeature(const int theIndex, bool forTree) const
+{
+  ResultPartPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultPart>(firstResult());
+  if (aResult.get()) {
+    DocumentPtr aDoc = aResult->partDoc();
+    if (aDoc.get() && aDoc->isOpened()) {
+      return aDoc->internalFeature(theIndex);
+    }
+  }
+  return FeaturePtr();
+}
+
+int PartSetPlugin_Part::subFeatureId(const int theIndex) const
+{
+  ResultPartPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultPart>(firstResult());
+  if (aResult.get()) {
+    DocumentPtr aDoc = aResult->partDoc();
+    if (aDoc.get() && aDoc->isOpened()) {
+      return aDoc->object(ModelAPI_Feature::group(), theIndex)->data()->featureId();
+    }
+  }
+  return 0; // none
+}
+
+bool PartSetPlugin_Part::isSub(ObjectPtr theObject) const
+{
+  ResultPartPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultPart>(firstResult());
+  if (aResult.get()) {
+    DocumentPtr aDoc = aResult->partDoc();
+    return document() == aDoc;
+  }
+  return false;
+}
+
+void PartSetPlugin_Part::removeFeature(std::shared_ptr<ModelAPI_Feature> theFeature)
+{
+  ResultPartPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultPart>(firstResult());
+  if (aResult.get()) {
+    DocumentPtr aDoc = aResult->partDoc();
+    if (aDoc.get() && aDoc->isOpened())
+      aDoc->removeFeature(theFeature);
+  }
+}