X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Object.h;h=0d9c067d61b761fd715ad6fd252a190512bbe086;hb=c66d90377083e2611816b72500533d4ffbc73e19;hp=6abadf9eae52ddd84ac98a2816e9493c2f1f239c;hpb=ca1d32b5d900a39c50749271b5dec53ed59c82af;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_Object.h b/src/ModelAPI/ModelAPI_Object.h
index 6abadf9ea..0d9c067d6 100644
--- a/src/ModelAPI/ModelAPI_Object.h
+++ b/src/ModelAPI/ModelAPI_Object.h
@@ -9,6 +9,7 @@
 
 #include "ModelAPI.h"
 #include "ModelAPI_Data.h"
+#include "ModelAPI_Entity.h"
 
 #include <memory>
 
@@ -24,11 +25,10 @@ class ModelAPI_Document;
  * objects related to the features and their results. Contains attributes of this 
  * object in the "Data".
  */
-class ModelAPI_Object
+class ModelAPI_Object: public ModelAPI_Entity
 {
   std::shared_ptr<ModelAPI_Data> myData;  ///< manager of the data model of a feature
   std::shared_ptr<ModelAPI_Document> myDoc;  ///< document this object belongs to
-  bool myInHistory; ///< keep the information about the presense of the object in the history tree
  public:
   /// By default object is displayed in the object browser.
   MODELAPI_EXPORT virtual bool isInHistory();
@@ -54,9 +54,15 @@ class ModelAPI_Object
   /// Request for initialization of data model of the object: adding all attributes
   virtual void initAttributes() = 0;
 
+  /// Returns the feature is disabled or not.
+  virtual bool isDisabled() = 0;
+
+  /// Returns the parameters of color definition in the resources config manager
+  virtual void colorConfigInfo(std::string& theSection, std::string& theName,
+                               std::string& theDefault) {}
+
   /// Called on change of any argument-attribute of this object
   /// \param theID identifier of changed attribute
-  // MODELAPI_EXPORT
   MODELAPI_EXPORT virtual void attributeChanged(const std::string& theID);
 
   /// Initializes the default states of the object
@@ -65,7 +71,20 @@ class ModelAPI_Object
   /// To use virtuality for destructors
   MODELAPI_EXPORT virtual ~ModelAPI_Object();
 
+  /// Returns true if object must be displayed in the viewer: flag is stored in the
+  /// data model, so on undo/redo, open/save or recreation of object by history-playing it keeps
+  /// the original state in the current transaction.
+  MODELAPI_EXPORT virtual bool isDisplayed();
+
+  /// Sets the displayed/hidden state of the object. If it is changed, sends the "redisplay"
+  /// signal.
+  MODELAPI_EXPORT virtual void setDisplayed(const bool theDisplay);
+
  protected:
+  /// This method is called just after creation of the object: it must initialize
+  /// all fields, normally initialized in the constructor
+  MODELAPI_EXPORT virtual void init() = 0;
+
   /// Sets the data manager of an object (document does)
   MODELAPI_EXPORT virtual void setData(std::shared_ptr<ModelAPI_Data> theData);
 
@@ -75,6 +94,7 @@ class ModelAPI_Object
   /// removes all fields from this feature
   MODELAPI_EXPORT virtual void erase();
 
+  friend class Model_Objects;
   friend class Model_Document;
 
 };