Implementation of mechanism of grouping of messages

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

diff --git a/src/Model/Model_Events.cpp b/src/Model/Model_Events.cpp
index cbf4859979003d74a98e762ac767ca08f87ef000..76655e1eec43a70b28f347420a9983c2883bcbfe 100644 (file)
--- a/src/Model/Model_Events.cpp
+++ b/src/Model/Model_Events.cpp
@@ -5,38 +5,46 @@
 #include <Model_Events.h>
 #include <Events_Loop.h>
 
-Model_FeatureDeletedMessage::Model_FeatureDeletedMessage(
-  const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
-  : Events_Message(messageId(), 0), myDoc(theDoc), myGroup(theGroup)
-
-{
+// UPDATED methods
+Events_MessageGroup* Model_FeatureUpdatedMessage::newEmpty() {
+  boost::shared_ptr<ModelAPI_Feature> anEmptyFeature;
+  return new Model_FeatureUpdatedMessage(anEmptyFeature, eventID());
 }
 
-const Events_ID Model_FeatureDeletedMessage::messageId()
+void Model_FeatureUpdatedMessage::Join(Events_MessageGroup& theJoined)
 {
-  static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURE_DELETED);
-  return MY_ID;
+  Model_FeatureUpdatedMessage* aJoined = dynamic_cast<Model_FeatureUpdatedMessage*>(&theJoined);
+  std::set<boost::shared_ptr<ModelAPI_Feature> >::iterator aFIter = aJoined->myFeatures.begin();
+  for(; aFIter != aJoined->myFeatures.end(); aFIter++) {
+    myFeatures.insert(*aFIter);
+  }
 }
 
-Model_FeaturesMovedMessage::Model_FeaturesMovedMessage()
-: Events_Message(messageId(), 0)
-{
+// DELETED methods
+Events_MessageGroup* Model_FeatureDeletedMessage::newEmpty() {
+  return new Model_FeatureDeletedMessage(myDoc, "");
 }
 
-const Events_ID Model_FeaturesMovedMessage::messageId()
+Model_FeatureDeletedMessage::Model_FeatureDeletedMessage(
+  const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
+  : Events_MessageGroup(messageId(), 0), myDoc(theDoc)
+
 {
-  static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURES_MOVED);
-  return MY_ID;
+  if (!theGroup.empty())
+    myGroups.insert(theGroup);
 }
 
-void Model_FeaturesMovedMessage::setFeatures(
-                                const std::list<boost::shared_ptr<ModelAPI_Feature> >& theFeatures)
+const Events_ID Model_FeatureDeletedMessage::messageId()
 {
-  myFeatures = theFeatures;  
+  static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURE_DELETED);
+  return MY_ID;
 }
 
-const std::list<boost::shared_ptr<ModelAPI_Feature> >& Model_FeaturesMovedMessage::features() const
+void Model_FeatureDeletedMessage::Join(Events_MessageGroup& theJoined)
 {
-  return myFeatures;
+  Model_FeatureDeletedMessage* aJoined = dynamic_cast<Model_FeatureDeletedMessage*>(&theJoined);
+  std::set<std::string>::iterator aGIter = aJoined->myGroups.begin();
+  for(; aGIter != aJoined->myGroups.end(); aGIter++) {
+    myGroups.insert(*aGIter);
+  }
 }
-