X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Data.h;h=1e6c0d65082a4df12d4f9b7c7e61c9b78feed426;hb=853e0eec6016120b641efa6adf427a239cf203cf;hp=10464cabdba9c7b620c0197f3c91a4186d1773cf;hpb=5352bbb1915f98d1f02b1cb953a2de19b286a28c;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Data.h b/src/Model/Model_Data.h
index 10464cabd..1e6c0d650 100644
--- a/src/Model/Model_Data.h
+++ b/src/Model/Model_Data.h
@@ -56,8 +56,6 @@ class Model_Data : public ModelAPI_Data
   /// flag that may block the "attribute updated" sending
   bool mySendAttributeUpdated;
 
-  Model_Data();
-
   /// Returns label of this feature
   TDF_Label label()
   {
@@ -71,8 +69,11 @@ class Model_Data : public ModelAPI_Data
   friend class Model_AttributeRefAttr;
   friend class Model_AttributeRefList;
   friend class Model_AttributeSelection;
+  friend class Model_AttributeSelectionList;
 
  public:
+  /// The simplest constructor. "setLabel" must be called just after to initialize correctly.
+  Model_Data();
   /// Returns the name of the feature visible by the user in the object browser
   MODEL_EXPORT virtual std::string name();
   /// Defines the name of the feature visible by the user in the object browser
@@ -169,6 +170,9 @@ class Model_Data : public ModelAPI_Data
   /// Registers error during the execution, causes the ExecutionFailed state
   MODEL_EXPORT virtual void setError(const std::string& theError, bool theSend = true);
 
+  /// Erases the error string if it is not empty
+  void eraseErrorString();
+
   /// Registers error during the execution, causes the ExecutionFailed state
   MODEL_EXPORT virtual std::string error() const;
 
@@ -186,6 +190,23 @@ class Model_Data : public ModelAPI_Data
   /// Copies all atributes content into theTarget data
   MODEL_EXPORT virtual void copyTo(std::shared_ptr<ModelAPI_Data> theTarget);
 
+  /// Returns the invalid data pointer (to avoid working with NULL shared ptrs in swig)
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Data> invalidPtr();
+
+  /// Returns the invalid data pointer: static method
+  static std::shared_ptr<ModelAPI_Data> invalidData();
+
+  /// Identifier of the transaction when object (feature or result) was updated last time.
+  MODEL_EXPORT virtual int updateID();
+
+  /// Identifier of the transaction when object (feature or result) was updated last time.
+  /// This method is called by the updater.
+  MODEL_EXPORT virtual void setUpdateID(const int theID);
+
+  /// Returns true if the given object is owner of this data (needed for correct erase of object
+  /// with duplicated data)
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Object> owner();
+
 protected:
   /// Returns true if "is in history" custom behaviors is defined for the feature
   MODEL_EXPORT virtual bool isInHistory();
@@ -193,6 +214,12 @@ protected:
   /// Defines the custom "is in history" behavior
   MODEL_EXPORT virtual void setIsInHistory(const bool theFlag);
 
+  /// Returns true if the object is deleted, but some data is still keept in memory
+  MODEL_EXPORT virtual bool isDeleted();
+
+  /// Sets true if the object is deleted, but some data is still keept in memory
+  MODEL_EXPORT virtual void setIsDeleted(const bool theFlag);
+
 private:
   /// Removes all information about back references
   void eraseBackReferences();
@@ -208,6 +235,9 @@ private:
   void addBackReference(FeaturePtr theFeature, std::string theAttrID, 
     const bool theApplyConcealment = true);
 
+  /// Makes the concealment flag up to date for this object-owner.
+  MODEL_EXPORT virtual void updateConcealmentFlag();
+
   /// 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 i nthe current transaction.