X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeDouble.h;h=17b82ea654cdee5352b0b346a1c240d430b4871b;hb=bd953380ed26bbef84337e8b2148d930969b5abe;hp=0079b639ced68fb7b877a666a5ddc967392bf757;hpb=34c92803a174324249d12ae0eb45143e0d8a9c23;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeDouble.h b/src/Model/Model_AttributeDouble.h
index 0079b639c..17b82ea65 100644
--- a/src/Model/Model_AttributeDouble.h
+++ b/src/Model/Model_AttributeDouble.h
@@ -1,15 +1,19 @@
+// 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.
@@ -17,17 +21,50 @@
 
 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
   MODEL_EXPORT virtual void setValue(const double theValue);
 
   /// Returns the double value
   MODEL_EXPORT virtual double value();
 
-protected:
-  /// Initializes attibutes
+  /// 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 attributes
   Model_AttributeDouble(TDF_Label& theLabel);
+  /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc)
+  virtual void reinit();
+
+  /// Resets attribute to deafult state.
+  virtual void reset();
 
   friend class Model_Data;
 };