X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_Data.h;h=8f8cfe5151f3d22f073a2120d45b10f1553e4bfe;hb=49c180426b47ea37eee3a779362fef3b78ab7cb9;hp=1a502b4b0ca0f295b3f43c25c0aa4de06f2ea3a4;hpb=c39f725bfe98395871c5853dacb89ab1a6ecc6f2;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Data.h b/src/Model/Model_Data.h
index 1a502b4b0..8f8cfe515 100644
--- a/src/Model/Model_Data.h
+++ b/src/Model/Model_Data.h
@@ -16,6 +16,7 @@
 #include <ModelAPI_AttributeRefAttr.h>
 #include <ModelAPI_AttributeReference.h>
 #include <ModelAPI_AttributeRefList.h>
+#include <ModelAPI_AttributeRefAttrList.h>
 #include <ModelAPI_AttributeString.h>
 #include <ModelAPI_AttributeIntArray.h>
 #include <ModelAPI_Data.h>
@@ -55,6 +56,8 @@ class Model_Data : public ModelAPI_Data
   std::set<AttributePtr> myRefsToMe;
   /// flag that may block the "attribute updated" sending
   bool mySendAttributeUpdated;
+  /// if some attribute was changed, but mySendAttributeUpdated was false, this flag stores this
+  bool myWasChangedButBlocked;
 
   /// Returns label of this feature
   TDF_Label label()
@@ -68,6 +71,7 @@ class Model_Data : public ModelAPI_Data
   friend class Model_AttributeReference;
   friend class Model_AttributeRefAttr;
   friend class Model_AttributeRefList;
+  friend class Model_AttributeRefAttrList;
   friend class Model_AttributeSelection;
   friend class Model_AttributeSelectionList;
 
@@ -100,6 +104,10 @@ class Model_Data : public ModelAPI_Data
   /// Returns the attribute that contains list of references to features
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeRefList>
     reflist(const std::string& theID);
+  /// Returns the attribute that contains list of references to features
+  /// or reference to an attribute of a feature
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeRefAttrList>
+    refattrlist(const std::string& theID);
   /// Returns the attribute that contains boolean value
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeBoolean>
     boolean(const std::string& theID);
@@ -170,6 +178,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;
 
@@ -202,7 +213,7 @@ class Model_Data : public ModelAPI_Data
 
   /// Returns true if the given object is owner of this data (needed for correct erase of object
   /// with duplicated data)
-  MODEL_EXPORT virtual bool isOwner(ModelAPI_Object* theOwner);
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Object> owner();
 
 protected:
   /// Returns true if "is in history" custom behaviors is defined for the feature
@@ -211,14 +222,22 @@ 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();
-  /// Adds a back reference (with identifier which attribute references to this object
-  /// It does not change the consealment flag of the data object result
+  /// Removes a back reference (with identifier which attribute references to this object)
   /// \param theFeature feature referenced to this
   /// \param theAttrID identifier of the attribute that is references from theFeature to this
   void removeBackReference(FeaturePtr theFeature, std::string theAttrID);
+  /// Removes a back reference (by the attribute)
+  /// \param theAttr the referenced attribute
+  void removeBackReference(AttributePtr theAttr);
   /// Adds a back reference (with identifier which attribute references to this object
   /// \param theFeature feature referenced to this
   /// \param theAttrID identifier of the attribute that is references from theFeature to this