X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Events.cpp;h=3a060d43f01fac344c320019bf1acb6543e0bf5e;hb=41f9517e84ae934ce536718d4f48e26731c8430d;hp=ae785563cf2c9f02c1cbf44f0201fe29d7352033;hpb=cd9217d7e87997ec8bc150a6d8c389e742ca0f84;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Events.cpp b/src/Model/Model_Events.cpp
index ae785563c..3a060d43f 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
@@ -12,14 +14,23 @@ Model_EventCreator MY_CREATOR;
 void Model_EventCreator::sendUpdated(const ObjectPtr& theObject, const Events_ID& theEvent,
                                      const bool isGroupped) const
 {
-  Model_ObjectUpdatedMessage aMsg(theObject, 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,
+void Model_EventCreator::sendDeleted(const std::shared_ptr<ModelAPI_Document>& theDoc,
                                      const std::string& theGroup) const
 {
-  Model_ObjectDeletedMessage aMsg(theDoc, theGroup);
+  std::shared_ptr<Model_ObjectDeletedMessage> aMsg(
+    new Model_ObjectDeletedMessage(theDoc, theGroup));
+  Events_Loop::loop()->send(aMsg, true);
+}
+
+void Model_EventCreator::sendReordered(const std::shared_ptr<ModelAPI_Feature>& theReordered) const
+{
+  std::shared_ptr<Model_OrderUpdatedMessage> aMsg(
+    new Model_OrderUpdatedMessage(theReordered));
   Events_Loop::loop()->send(aMsg, true);
 }
 
@@ -33,24 +44,27 @@ Model_ObjectUpdatedMessage::Model_ObjectUpdatedMessage(const ObjectPtr& theObjec
                                                        const Events_ID& theEvent)
     : ModelAPI_ObjectUpdatedMessage(theEvent, 0)
 {
-  if (theObject)
+  if (theObject) {
     myObjects.insert(theObject);
+  }
 }
 
-std::set<ObjectPtr> Model_ObjectUpdatedMessage::objects() const
+const std::set<ObjectPtr>& Model_ObjectUpdatedMessage::objects() const
 {
   return myObjects;
 }
 
-Events_MessageGroup* Model_ObjectUpdatedMessage::newEmpty()
+std::shared_ptr<Events_MessageGroup> Model_ObjectUpdatedMessage::newEmpty()
 {
   ObjectPtr anEmptyObject;
-  return new Model_ObjectUpdatedMessage(anEmptyObject, eventID());
+  return std::shared_ptr<Model_ObjectUpdatedMessage>(
+    new Model_ObjectUpdatedMessage(anEmptyObject, eventID()));
 }
 
-void Model_ObjectUpdatedMessage::Join(Events_MessageGroup& theJoined)
+void Model_ObjectUpdatedMessage::Join(const std::shared_ptr<Events_MessageGroup>& theJoined)
 {
-  Model_ObjectUpdatedMessage* aJoined = dynamic_cast<Model_ObjectUpdatedMessage*>(&theJoined);
+  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);
@@ -59,7 +73,7 @@ void Model_ObjectUpdatedMessage::Join(Events_MessageGroup& theJoined)
 
 /////////////////////// DELETED MESSAGE /////////////////////////////
 Model_ObjectDeletedMessage::Model_ObjectDeletedMessage(
-    const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
+    const std::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
     : ModelAPI_ObjectDeletedMessage(messageId(), 0),
       myDoc(theDoc)
 {
@@ -67,9 +81,9 @@ Model_ObjectDeletedMessage::Model_ObjectDeletedMessage(
     myGroups.insert(theGroup);
 }
 
-Events_MessageGroup* Model_ObjectDeletedMessage::newEmpty()
+std::shared_ptr<Events_MessageGroup> Model_ObjectDeletedMessage::newEmpty()
 {
-  return new Model_ObjectDeletedMessage(myDoc, "");
+  return std::shared_ptr<Model_ObjectDeletedMessage>(new Model_ObjectDeletedMessage(myDoc, ""));
 }
 
 const Events_ID Model_ObjectDeletedMessage::messageId()
@@ -78,11 +92,26 @@ const Events_ID Model_ObjectDeletedMessage::messageId()
   return MY_ID;
 }
 
-void Model_ObjectDeletedMessage::Join(Events_MessageGroup& theJoined)
+void Model_ObjectDeletedMessage::Join(const std::shared_ptr<Events_MessageGroup>& theJoined)
 {
-  Model_ObjectDeletedMessage* aJoined = dynamic_cast<Model_ObjectDeletedMessage*>(&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++) {
     myGroups.insert(*aGIter);
   }
 }
+
+/////////////////////// REORDERED MESSAGE /////////////////////////////
+Model_OrderUpdatedMessage::Model_OrderUpdatedMessage(
+    FeaturePtr theReordered, const void* theSender)
+    : ModelAPI_OrderUpdatedMessage(messageId(), theSender),
+    myReordered(theReordered)
+{
+}
+
+const Events_ID Model_OrderUpdatedMessage::messageId()
+{
+  static Events_ID MY_ID = Events_Loop::eventByName(EVENT_ORDER_UPDATED);
+  return MY_ID;
+}