X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Attribute.h;h=442e4e4a05065fa93dedaecb8721c5959a362232;hb=aea15db62bec148b6bfd5db468c682b1695c3449;hp=27d65eb9b69eb8bc96b6ac5da4b680a5fb55acad;hpb=9e869ede4d8c56262bb20534543c2bf56cd6a91b;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_Attribute.h b/src/ModelAPI/ModelAPI_Attribute.h
index 27d65eb9b..442e4e4a0 100644
--- a/src/ModelAPI/ModelAPI_Attribute.h
+++ b/src/ModelAPI/ModelAPI_Attribute.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        ModelAPI_Attribute.h
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -19,11 +21,13 @@ class ModelAPI_Attribute
 {
   ///< needed here to emit signal that feature changed on change of the attribute
   std::shared_ptr<ModelAPI_Object> myObject;
+  std::string myID; ///< identifier of this attribute in Data class
  protected:
   // accessible from the attributes
-  bool myIsInitialized;
-  bool myIsArgument;
-  bool myIsImmutable;
+  bool myIsInitialized; ///< is some value assigned to this attribute
+  bool mySetInitializedBlocked; ///< is initialized blocked
+  bool myIsArgument;    ///< is this attribute used as an argument for execution
+  bool myIsImmutable;   ///< is this attribute can be changed programmatically (e.g. by constraint)
 
  public:
 
@@ -31,72 +35,51 @@ class ModelAPI_Attribute
   MODELAPI_EXPORT virtual std::string attributeType() = 0;
 
   /// To virtually destroy the fields of successors
-  MODELAPI_EXPORT virtual ~ModelAPI_Attribute()
-  {
-  }
+  MODELAPI_EXPORT virtual ~ModelAPI_Attribute();
 
   /// Sets the owner of this attribute
-  MODELAPI_EXPORT virtual void setObject(const std::shared_ptr<ModelAPI_Object>& theObject)
-  {
-    myObject = theObject;
-  }
+  MODELAPI_EXPORT virtual void setObject(const std::shared_ptr<ModelAPI_Object>& theObject);
 
   /// Returns the owner of this attribute
-  MODELAPI_EXPORT const std::shared_ptr<ModelAPI_Object>& owner() const
-  {
-    return myObject;
-  }
+  MODELAPI_EXPORT const std::shared_ptr<ModelAPI_Object>& owner() const;
 
   /// Returns true if attribute was  initialized by some value
-  MODELAPI_EXPORT bool isInitialized()
-  {
-    return myIsInitialized;
-  }
+  MODELAPI_EXPORT virtual bool isInitialized();
 
   /// Makes attribute initialized
-  MODELAPI_EXPORT void setInitialized()
-  {
-    myIsInitialized = true;
-  }
+  MODELAPI_EXPORT void setInitialized();
+
+  /// Blocks sending "attribute updated" if theBlock is true
+  /// \param theBlock a block value
+  /// \return the previous block value
+  MODELAPI_EXPORT bool blockSetInitialized(const bool theBlock);
 
   /// Set this attribute is argument for result (change of this attribute requires update of result).
   /// By default it is true.
-  MODELAPI_EXPORT void setIsArgument(const bool theFlag)
-  {
-    myIsArgument = theFlag;
-  }
+  MODELAPI_EXPORT void setIsArgument(const bool theFlag);
 
   /// Returns true if attribute causes the result change
-  MODELAPI_EXPORT bool isArgument()
-  {
-    return myIsArgument;
-  }
+  MODELAPI_EXPORT bool isArgument();
 
   /// Immutable argument can not be changed programaticaly (e.g. by constraint)
   /// By default it is false.
   /// Returns the previous state of the attribute's immutability.
-  MODELAPI_EXPORT bool setImmutable(const bool theFlag)
-  {
-    bool aResult = myIsImmutable;
-    myIsImmutable = theFlag;
-    return aResult;
-  }
+  MODELAPI_EXPORT bool setImmutable(const bool theFlag);
 
   /// Returns true if can not be changed programaticaly
-  MODELAPI_EXPORT bool isImmutable()
-  {
-    return myIsImmutable;
-  }
+  MODELAPI_EXPORT bool isImmutable();
+
+  /// ID of the attribute in Data
+  MODELAPI_EXPORT const std::string& id() const;
 
  protected:
   /// Objects are created for features automatically
-  ModelAPI_Attribute()
-  {
-    myIsInitialized = false;
-    myIsArgument = true;
-    myIsImmutable = false;
-  }
+  MODELAPI_EXPORT ModelAPI_Attribute();
+
+  /// Sets the ID of the attribute in Data (called from Data)
+  MODELAPI_EXPORT virtual void setID(const std::string theID);
 
+  friend class Model_Data;
 };
 
 //! Pointer on attribute object