Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

[modules/shaper.git] / src / Model / Model_Application.cpp

diff --git a/src/Model/Model_Application.cpp b/src/Model/Model_Application.cpp
index f8955ce59d5da228b8bd276828f1a1a914f6a964..a825e747104b6482f68a0b14a7bbbbcc4b13d182 100644 (file)
--- a/src/Model/Model_Application.cpp
+++ b/src/Model/Model_Application.cpp
@@ -30,19 +30,21 @@ const std::shared_ptr<Model_Document>& Model_Application::getDocument(string the
 
   static const std::string thePartSetKind("PartSet");
   static const std::string thePartKind("Part");
+  bool isRoot = theDocID == "root"; // the document is root
   std::shared_ptr<Model_Document> aNew(
-    new Model_Document(theDocID, theDocID == "root" ? thePartSetKind : thePartKind));
+    new Model_Document(theDocID, isRoot ? thePartSetKind : thePartKind));
   myDocs[theDocID] = aNew;
 
-  Events_ID anId = ModelAPI_DocumentCreatedMessage::eventId();
-  std::shared_ptr<ModelAPI_DocumentCreatedMessage> aMessage =
-        std::shared_ptr<ModelAPI_DocumentCreatedMessage>(new ModelAPI_DocumentCreatedMessage(anId, this));
-  aMessage->setDocument(aNew);
-  Events_Loop::loop()->send(aMessage);
   // load it if it must be loaded by demand
   if (myLoadedByDemand.find(theDocID) != myLoadedByDemand.end() && !myPath.empty()) {
     aNew->load(myPath.c_str());
     myLoadedByDemand.erase(theDocID);  // done, don't do it anymore
+  } else {
+    static Events_ID anId = ModelAPI_DocumentCreatedMessage::eventId();
+    std::shared_ptr<ModelAPI_DocumentCreatedMessage> aMessage = std::shared_ptr
+      <ModelAPI_DocumentCreatedMessage>(new ModelAPI_DocumentCreatedMessage(anId, this));
+    aMessage->setDocument(aNew);
+    Events_Loop::loop()->send(aMessage);
   }
 
   return myDocs[theDocID];