Issue #604 Creation of an unexpected line in the Sketcher

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

diff --git a/src/PartSetPlugin/PartSetPlugin_Part.cpp b/src/PartSetPlugin/PartSetPlugin_Part.cpp
index 47fa360a9ee84a6163d0d966c1e26a72d5cf8574..fda4e53a14613add4c2c1acf9787f55b0a369bb7 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Part.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Part.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        PartSetPlugin_Part.cxx
 // Created:     27 Mar 2014
 // Author:      Mikhail PONIKAROV
@@ -8,6 +10,7 @@
 #include "ModelAPI_Data.h"
 #include "ModelAPI_AttributeDocRef.h"
 #include <ModelAPI_ResultPart.h>
+#include <ModelAPI_Events.h>
 
 using namespace std;
 
@@ -25,11 +28,22 @@ 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();
+    }
   }
 }
 
-std::shared_ptr<ModelAPI_Document> PartSetPlugin_Part::documentToAdd()
+const std::string& PartSetPlugin_Part::documentToAdd()
 {
-  return ModelAPI_Session::get()->moduleDocument();
+  // part must be added only to the module document
+  return ModelAPI_Session::get()->moduleDocument()->kind();
 }