X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Events.cpp;h=13c4d256873c97719cc6a525c49006d26432cf13;hb=2c5d9762904d572995855e2ce2239ea0c3463eb5;hp=fb94001b86aa83d13717f28861f40b63181da385;hpb=12621bb509825d0eb1fb0847a7f9c8011021ca5a;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Events.cpp b/src/Model/Model_Events.cpp
index fb94001b8..13c4d2568 100644
--- a/src/Model/Model_Events.cpp
+++ b/src/Model/Model_Events.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        Model_Events.cxx
 // Created:     10 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -9,17 +11,19 @@
 Model_EventCreator MY_CREATOR;
 
 /////////////////////// CREATOR /////////////////////////////
-void Model_EventCreator::sendUpdated(
-  const FeaturePtr& theFeature, const Events_ID& theEvent, const bool isGroupped) const
+void Model_EventCreator::sendUpdated(const ObjectPtr& theObject, const Events_ID& theEvent,
+                                     const bool isGroupped) const
 {
-  Model_FeatureUpdatedMessage aMsg(theFeature, theEvent);
+  std::shared_ptr<Model_ObjectUpdatedMessage> aMsg(
+    new Model_ObjectUpdatedMessage(theObject, theEvent));
   Events_Loop::loop()->send(aMsg, isGroupped);
 }
 
-void Model_EventCreator::sendDeleted(
-  const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup) const
+void Model_EventCreator::sendDeleted(const std::shared_ptr<ModelAPI_Document>& theDoc,
+                                     const std::string& theGroup) const
 {
-  Model_FeatureDeletedMessage aMsg(theDoc, theGroup);
+  std::shared_ptr<Model_ObjectDeletedMessage> aMsg(
+    new Model_ObjectDeletedMessage(theDoc, theGroup));
   Events_Loop::loop()->send(aMsg, true);
 }
 
@@ -29,58 +33,64 @@ Model_EventCreator::Model_EventCreator()
 }
 
 /////////////////////// UPDATED MESSAGE /////////////////////////////
-Model_FeatureUpdatedMessage::Model_FeatureUpdatedMessage(
-  const FeaturePtr& theFeature,
-  const Events_ID& theEvent) : ModelAPI_FeatureUpdatedMessage(theEvent, 0)
+Model_ObjectUpdatedMessage::Model_ObjectUpdatedMessage(const ObjectPtr& theObject,
+                                                       const Events_ID& theEvent)
+    : ModelAPI_ObjectUpdatedMessage(theEvent, 0)
 {
-  if (theFeature) myFeatures.insert(theFeature);
+  if (theObject) {
+    myObjects.insert(theObject);
+  }
 }
 
-std::set<FeaturePtr> Model_FeatureUpdatedMessage::features() const 
+const std::set<ObjectPtr>& Model_ObjectUpdatedMessage::objects() const
 {
-  return myFeatures;
+  return myObjects;
 }
 
-Events_MessageGroup* Model_FeatureUpdatedMessage::newEmpty() 
+std::shared_ptr<Events_MessageGroup> Model_ObjectUpdatedMessage::newEmpty()
 {
-  FeaturePtr anEmptyFeature;
-  return new Model_FeatureUpdatedMessage(anEmptyFeature, eventID());
+  ObjectPtr anEmptyObject;
+  return std::shared_ptr<Model_ObjectUpdatedMessage>(
+    new Model_ObjectUpdatedMessage(anEmptyObject, eventID()));
 }
 
-void Model_FeatureUpdatedMessage::Join(Events_MessageGroup& theJoined) 
+void Model_ObjectUpdatedMessage::Join(const std::shared_ptr<Events_MessageGroup>& theJoined)
 {
-  Model_FeatureUpdatedMessage* aJoined = dynamic_cast<Model_FeatureUpdatedMessage*>(&theJoined);
-  std::set<FeaturePtr >::iterator aFIter = aJoined->myFeatures.begin();
-  for(; aFIter != aJoined->myFeatures.end(); aFIter++) {
-    myFeatures.insert(*aFIter);
+  std::shared_ptr<Model_ObjectUpdatedMessage> aJoined = 
+    std::dynamic_pointer_cast<Model_ObjectUpdatedMessage>(theJoined);
+  std::set<ObjectPtr>::iterator aFIter = aJoined->myObjects.begin();
+  for (; aFIter != aJoined->myObjects.end(); aFIter++) {
+    myObjects.insert(*aFIter);
   }
 }
 
 /////////////////////// DELETED MESSAGE /////////////////////////////
-Model_FeatureDeletedMessage::Model_FeatureDeletedMessage(
-  const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
-  : ModelAPI_FeatureDeletedMessage(messageId(), 0), myDoc(theDoc)
+Model_ObjectDeletedMessage::Model_ObjectDeletedMessage(
+    const std::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
+    : ModelAPI_ObjectDeletedMessage(messageId(), 0),
+      myDoc(theDoc)
 {
   if (!theGroup.empty())
     myGroups.insert(theGroup);
 }
 
-Events_MessageGroup* Model_FeatureDeletedMessage::newEmpty() 
+std::shared_ptr<Events_MessageGroup> Model_ObjectDeletedMessage::newEmpty()
 {
-  return new Model_FeatureDeletedMessage(myDoc, "");
+  return std::shared_ptr<Model_ObjectDeletedMessage>(new Model_ObjectDeletedMessage(myDoc, ""));
 }
 
-const Events_ID Model_FeatureDeletedMessage::messageId()
+const Events_ID Model_ObjectDeletedMessage::messageId()
 {
-  static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURE_DELETED);
+  static Events_ID MY_ID = Events_Loop::eventByName(EVENT_OBJECT_DELETED);
   return MY_ID;
 }
 
-void Model_FeatureDeletedMessage::Join(Events_MessageGroup& theJoined)
+void Model_ObjectDeletedMessage::Join(const std::shared_ptr<Events_MessageGroup>& theJoined)
 {
-  Model_FeatureDeletedMessage* aJoined = dynamic_cast<Model_FeatureDeletedMessage*>(&theJoined);
+  std::shared_ptr<Model_ObjectDeletedMessage> aJoined = 
+    std::dynamic_pointer_cast<Model_ObjectDeletedMessage>(theJoined);
   std::set<std::string>::iterator aGIter = aJoined->myGroups.begin();
-  for(; aGIter != aJoined->myGroups.end(); aGIter++) {
+  for (; aGIter != aJoined->myGroups.end(); aGIter++) {
     myGroups.insert(*aGIter);
   }
 }