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

diff --git a/src/Model/Model_AttributeDouble.h b/src/Model/Model_AttributeDouble.h
index d498bc42b..abf394aa6 100644
--- a/src/Model/Model_AttributeDouble.h
+++ b/src/Model/Model_AttributeDouble.h
@@ -1,35 +1,67 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        Model_AttributeDouble.h
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeDouble_HeaderFile
-#define Model_AttributeDouble_HeaderFile
+#ifndef Model_AttributeDouble_H_
+#define Model_AttributeDouble_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeDouble.h"
-#include <TDataStd_Real.hxx>
+
 #include <TDF_Label.hxx>
 
+class ModelAPI_ExpressionDouble;
+
 /**\class Model_AttributeDouble
  * \ingroup DataModel
  * \brief Attribute that contains real value with double precision.
  */
 
-class MODEL_EXPORT Model_AttributeDouble : public ModelAPI_AttributeDouble
+class Model_AttributeDouble : public ModelAPI_AttributeDouble
 {
-  Handle_TDataStd_Real myReal; ///< double is Real attribute
-public:
+  std::shared_ptr<ModelAPI_ExpressionDouble> myExpression;
+
+ public:
   /// Defines the double value
-  virtual void setValue(const double theValue);
+  MODEL_EXPORT virtual void setValue(const double theValue);
 
   /// Returns the double value
-  virtual double value();
+  MODEL_EXPORT virtual 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 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);
+ protected:
+  /// Initializes attributes
+  Model_AttributeDouble();
 
-  friend class Model_Object;
+  friend class Model_Data;
 };
 
 #endif