X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_AttributeDouble.h;h=da9ca4b55d62cf0c67285873ccc7869598e20d5b;hb=061a63480f6840b6d945f7744b3b972e2d4cb25d;hp=6c999936593e4b8a37586e3fd0604ef3da1fafc4;hpb=16d1695b03bd17ebf4ba4a26e41956d1dd7a89d8;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeDouble.h b/src/Model/Model_AttributeDouble.h
index 6c9999365..da9ca4b55 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,10 +30,13 @@ 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)
@@ -42,8 +45,20 @@ class Model_AttributeDouble : public ModelAPI_AttributeDouble
   /// 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_AttributeDouble(TDF_Label& theLabel);
 
   friend class Model_Data;