X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeInteger.h;h=c56ff8af9b45a20339f4416799cd45ebaf811a93;hb=73b293b1c77ab13ac9fbbb2aefb3b8573e63180b;hp=a723227bc550c7efc77309ff766e984650801491;hpb=3874b57fe5aba25ff5aee2a07654fc23c1ee8eb0;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeInteger.h b/src/Model/Model_AttributeInteger.h
index a723227bc..c56ff8af9 100644
--- a/src/Model/Model_AttributeInteger.h
+++ b/src/Model/Model_AttributeInteger.h
@@ -11,28 +11,60 @@
 #include <ModelAPI_AttributeInteger.h>
 
 #include <TDF_Label.hxx>
-#include <TDataStd_Integer.hxx>
+
+class ModelAPI_ExpressionInteger;
 
 /**\class Model_AttributeInteger
  * \ingroup DataModel
- * \brief Attribute that contains integer (int).
+ * \brief Attribute that contains integer.
  */
 
 class Model_AttributeInteger : public ModelAPI_AttributeInteger
 {
-  Handle_TDataStd_Integer myInteger;
  public:
-  /// Defines the int value
+  /// Defines the integer value
   MODEL_EXPORT virtual void setValue(const int theValue);
 
-  /// Returns the int value
+  /// Returns the integer value
   MODEL_EXPORT virtual int value();
 
+  /// Defines the calculated value
+  MODEL_EXPORT virtual void setCalculatedValue(const int theValue);
+
+  /// Defines the text value
+  MODEL_EXPORT virtual void setText(const std::string& theText);
+
+  /// Returns the text value
+  MODEL_EXPORT virtual std::string text();
+
+  /// Allows to set expression (text) as invalid (by the parameters listener)
+  MODEL_EXPORT virtual void setExpressionInvalid(const bool theFlag);
+
+  /// Returns true if text is invalid
+  MODEL_EXPORT virtual bool expressionInvalid();
+
+  /// Allows to set expression (text) error (by the parameters listener)
+  MODEL_EXPORT virtual void setExpressionError(const std::string& theError);
+
+  /// Returns an expression error
+  MODEL_EXPORT virtual std::string expressionError();
+
+  /// Defines the used parameters
+  MODEL_EXPORT virtual void setUsedParameters(const std::set<std::string>& theUsedParameters);
+
+  /// Returns the used parameters
+  MODEL_EXPORT virtual std::set<std::string> usedParameters() const;
+
  protected:
-  /// Initializes attibutes
+  /// Initializes attributes
   Model_AttributeInteger(TDF_Label& theLabel);
+  /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc)
+  virtual void reinit();
 
   friend class Model_Data;
+
+ private:
+  std::shared_ptr<ModelAPI_ExpressionInteger> myExpression;
 };
 
 #endif