X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeDouble.h;h=abf394aa611c84b59883de8932ef3eb86d9445c5;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=951c99613ad1f0640acd05890c1c9607dc3841a6;hpb=3400f9977cb5bbc2c00d5d797b572acd083d1675;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeDouble.h b/src/Model/Model_AttributeDouble.h
index 951c99613..abf394aa6 100644
--- a/src/Model/Model_AttributeDouble.h
+++ b/src/Model/Model_AttributeDouble.h
@@ -9,10 +9,10 @@
 
 #include "Model.h"
 #include "ModelAPI_AttributeDouble.h"
-#include <TDataStd_Real.hxx>
+
 #include <TDF_Label.hxx>
 
-#include <TDataStd_Name.hxx>
+class ModelAPI_ExpressionDouble;
 
 /**\class Model_AttributeDouble
  * \ingroup DataModel
@@ -21,8 +21,8 @@
 
 class Model_AttributeDouble : public ModelAPI_AttributeDouble
 {
-  Handle_TDataStd_Real myReal;  ///< double is Real attribute
-  Handle_TDataStd_Name myText;  ///< Text representation of the attribute (may differ for parametres)
+  std::shared_ptr<ModelAPI_ExpressionDouble> myExpression;
+
  public:
   /// Defines the double value
   MODEL_EXPORT virtual void setValue(const double theValue);
@@ -30,15 +30,36 @@ class Model_AttributeDouble : public ModelAPI_AttributeDouble
   /// Returns the double value
   MODEL_EXPORT virtual double value();
 
-  /// Defines the double value
+  /// Defines the calculated double value
+  MODEL_EXPORT virtual void setCalculatedValue(const double theValue);
+
+  /// Defines the text value
   MODEL_EXPORT virtual void setText(const std::string& theText);
 
-  /// Returns the double value
+  /// 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
-  Model_AttributeDouble(TDF_Label& theLabel);
+  /// Initializes attributes
+  Model_AttributeDouble();
 
   friend class Model_Data;
 };