X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Events.h;h=97f4170a4c8f7eadda1d44a5919d9b2207aaadbd;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=a4912648dd62a99db9876a444920b6653362aacf;hpb=12621bb509825d0eb1fb0847a7f9c8011021ca5a;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Events.h b/src/Model/Model_Events.h
index a4912648d..97f4170a4 100644
--- a/src/Model/Model_Events.h
+++ b/src/Model/Model_Events.h
@@ -1,73 +1,118 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        Model_Events.h
 // Created:     10 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Events_HeaderFile
-#define Model_Events_HeaderFile
+#ifndef Model_Events_H_
+#define Model_Events_H_
 
 #include <Model.h>
 #include <ModelAPI_Events.h>
 
+#include <memory>
+
 /// Allovs to create ModelAPI messages
-class Model_EventCreator : public ModelAPI_EventCreator {
-public:
+class Model_EventCreator : public ModelAPI_EventCreator
+{
+ public:
   /// creates created, updated or moved messages and sends to the loop
-  virtual void sendUpdated(
-    const FeaturePtr& theFeature, const Events_ID& theEvent, const bool isGroupped = true) const;
+  virtual void sendUpdated(const ObjectPtr& theObject, const Events_ID& theEvent,
+                           const bool isGroupped = true) const;
   /// creates deleted message and sends to the loop
-  virtual void sendDeleted(
-    const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup) const;
+  virtual void sendDeleted(const std::shared_ptr<ModelAPI_Document>& theDoc,
+                           const std::string& theGroup) const;
+
+  /// creates reordered message and sends to the loop
+  virtual void sendReordered(const std::shared_ptr<ModelAPI_Document>& theDoc,
+                             const std::string& theGroup) const;
 
   /// must be one per application, the constructor for internal usage only
   Model_EventCreator();
 };
 
 /// Message that feature was changed (used for Object Browser update): moved, updated and deleted
-class Model_FeatureUpdatedMessage : public ModelAPI_FeatureUpdatedMessage {
-  std::set<FeaturePtr> myFeatures; ///< which feature is changed
+class Model_ObjectUpdatedMessage : public ModelAPI_ObjectUpdatedMessage
+{
+  std::set<ObjectPtr> myObjects;  ///< which feature is changed
 
   /// Sender is not important, all information is located in the feature.
   /// Use ModelAPI for creation of this event. Used for creation, movement and edition events.
-  Model_FeatureUpdatedMessage(
-    const FeaturePtr& theFeature,
-    const Events_ID& theEvent);
+  Model_ObjectUpdatedMessage(const ObjectPtr& theObject, const Events_ID& theEvent);
 
   friend class Model_EventCreator;
-public:
+ public:
 
   /// Returns the feature that has been updated
-  virtual std::set<FeaturePtr> features() const;
+  virtual const std::set<ObjectPtr>& objects() const;
 
   //! Creates a new empty group (to store it in the loop before flush)
-  virtual Events_MessageGroup* newEmpty();
+  virtual std::shared_ptr<Events_MessageGroup> newEmpty();
 
   //! Allows to join the given message with the current one
-  virtual void Join(Events_MessageGroup& theJoined);
+  virtual void Join(const std::shared_ptr<Events_MessageGroup>& theJoined);
 };
 
 /// Message that feature was deleted (used for Object Browser update)
-class Model_FeatureDeletedMessage : public ModelAPI_FeatureDeletedMessage {
-  boost::shared_ptr<ModelAPI_Document> myDoc; ///< document owner of the feature
-  std::set<std::string> myGroups; ///< group identifiers that contained the deleted feature
+class Model_ObjectDeletedMessage : public ModelAPI_ObjectDeletedMessage
+{
+  std::shared_ptr<ModelAPI_Document> myDoc;  ///< document owner of the feature
+  std::set<std::string> myGroups;  ///< group identifiers that contained the deleted feature
 
   /// Use ModelAPI for creation of this event.
-  Model_FeatureDeletedMessage(
-    const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup);
+  Model_ObjectDeletedMessage(const std::shared_ptr<ModelAPI_Document>& theDoc,
+                             const std::string& theGroup);
 
   friend class Model_EventCreator;
-public:
-  /// Returns the feature that has been updated
-  virtual boost::shared_ptr<ModelAPI_Document> document() const {return myDoc;}
+ public:
+  /// Returns the document that has been updated
+  virtual std::shared_ptr<ModelAPI_Document> document() const
+  {
+    return myDoc;
+  }
+
+  /// Returns the group where the objects were deleted
+  virtual const std::set<std::string>& groups() const
+  {
+    return myGroups;
+  }
+
+  /// Returns the new empty message of this type
+  virtual std::shared_ptr<Events_MessageGroup> newEmpty();
+
+  /// Returns the identifier of this message
+  virtual const Events_ID messageId();
 
-  /// Returns the group where the feature was deleted
-  virtual const std::set<std::string >& groups() const {return myGroups;}
+  /// Appends to this message the given one
+  virtual void Join(const std::shared_ptr<Events_MessageGroup>& theJoined);
+};
 
-  virtual Events_MessageGroup* newEmpty();
+/// Message that feature was deleted (used for Object Browser update)
+class Model_OrderUpdatedMessage : public ModelAPI_OrderUpdatedMessage
+{
+  std::shared_ptr<ModelAPI_Document> myDoc;  ///< document owner of the feature
+  std::string myGroup;  ///< group identifier that contained the deleted feature
 
+  /// Use ModelAPI for creation of this event.
+  Model_OrderUpdatedMessage(const std::shared_ptr<ModelAPI_Document>& theDoc,
+                             const std::string& theGroup);
 
+  friend class Model_EventCreator;
+ public:
+  /// Returns the document that has been updated
+  virtual std::shared_ptr<ModelAPI_Document> document() const
+  {
+    return myDoc;
+  }
+
+  /// Returns the group where the objects were reordered
+  virtual const std::string& group() const
+  {
+    return myGroup;
+  }
+
+  /// Returns the identifier of this message
   virtual const Events_ID messageId();
-
-  virtual void Join(Events_MessageGroup& theJoined);
 };
 
 #endif