Provide connection of new features in SALOME module

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

diff --git a/src/Model/Model_Events.h b/src/Model/Model_Events.h
index 0e750f5a6f29dad229606a22b9eb4070e32bff07..1fbf1980e1481b40ab2c1ef50340bf6131fc09f7 100644 (file)
--- a/src/Model/Model_Events.h
+++ b/src/Model/Model_Events.h
@@ -12,7 +12,8 @@
 #include <string>
 #include <set>
 
-class ModelAPI_Feature;
+#include "ModelAPI_Feature.h"
+
 class ModelAPI_Document;
 
 /// Event ID that feature is created (comes with Model_FeatureUpdatedMessage)
@@ -22,25 +23,35 @@ static const char * EVENT_FEATURE_UPDATED = "FeatureUpdated";
 /// Event ID that data of feature is deleted (comes with Model_FeatureDeletedMessage)
 static const char * EVENT_FEATURE_DELETED = "FeatureDeleted";
 /// Event ID that data of feature is updated (comes with Model_FeaturesMovedMessage)
-static const char * EVENT_FEATURES_MOVED = "FeaturesMoved";
+static const char * EVENT_FEATURE_MOVED = "FeaturesMoved";
 
 /// Message that feature was changed (used for Object Browser update): moved, updated and deleted
 class Model_FeatureUpdatedMessage : public Events_MessageGroup {
-  std::set<boost::shared_ptr<ModelAPI_Feature> > myFeatures; ///< which feature is changed
+  std::set<FeaturePtr > myFeatures; ///< which feature is changed
 public:
   /// sender is not important, all information is located in the feature
   Model_FeatureUpdatedMessage(
-    const boost::shared_ptr<ModelAPI_Feature>& theFeature,
+    const FeaturePtr& theFeature,
     const Events_ID& theEvent) : Events_MessageGroup(theEvent, 0)
   {if (theFeature) myFeatures.insert(theFeature);}
 
   /// Returns the feature that has been updated
-  std::set<boost::shared_ptr<ModelAPI_Feature> > features() const {return myFeatures;}
+  std::set<FeaturePtr > features() const {return myFeatures;}
 
   //! Creates a new empty group (to store it in the loop before flush)
-  virtual Events_MessageGroup* newEmpty();
+  virtual Events_MessageGroup* newEmpty() {
+    FeaturePtr anEmptyFeature;
+    return new Model_FeatureUpdatedMessage(anEmptyFeature, eventID());
+  }
+
   //! Allows to join the given message with the current one
-  virtual void Join(Events_MessageGroup& theJoined);
+  virtual void Join(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);
+    }
+  }
 };
 
 /// Message that feature was deleted (used for Object Browser update)
@@ -49,11 +60,11 @@ class Model_FeatureDeletedMessage : public Events_MessageGroup {
   std::set<std::string> myGroups; ///< group identifiers that contained the deleted feature
 public:
   /// creates a message by initialization of fields
-  Model_FeatureDeletedMessage(const boost::shared_ptr<ModelAPI_Document>& theDoc,
-    const std::string& theGroup);
+//  Model_FeatureDeletedMessage(const boost::shared_ptr<ModelAPI_Document>& theDoc,
+//    const std::string& theGroup);
 
   /// Returns the ID of this message (EVENT_FEATURE_DELETED)
-  static const Events_ID messageId();
+//  static const Events_ID messageId();
 
   /// Returns the feature that has been updated
   boost::shared_ptr<ModelAPI_Document> document() const {return myDoc;}
@@ -62,10 +73,38 @@ public:
   const std::set<std::string >& groups() const {return myGroups;}
 
   //! Creates a new empty group (to store it in the loop before flush)
-  virtual Events_MessageGroup* newEmpty();
+//  virtual Events_MessageGroup* newEmpty();
 
   //! Allows to join the given message with the current one
-  virtual void Join(Events_MessageGroup& theJoined);
+//  virtual void Join(Events_MessageGroup& theJoined);
+
+  Events_MessageGroup* newEmpty() {
+    return new Model_FeatureDeletedMessage(myDoc, "");
+  }
+
+  Model_FeatureDeletedMessage(
+    const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
+    : Events_MessageGroup(messageId(), 0), myDoc(theDoc)
+
+  {
+    if (!theGroup.empty())
+      myGroups.insert(theGroup);
+  }
+
+  const Events_ID messageId()
+  {
+    static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURE_DELETED);
+    return MY_ID;
+  }
+
+  void Join(Events_MessageGroup& theJoined)
+  {
+    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);
+    }
+  }
 };
 
 #endif