X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeDouble.h;h=559a4c8cec632dd442447ed89da5eebb576444d7;hb=8d9373fd00a410b2e9fc7ac6b0653716314ded2d;hp=f04db7f88e9cdba0b4aef6b0fbd619e8cbfe08aa;hpb=3874b57fe5aba25ff5aee2a07654fc23c1ee8eb0;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeDouble.h b/src/Model/Model_AttributeDouble.h
index f04db7f88..559a4c8ce 100644
--- a/src/Model/Model_AttributeDouble.h
+++ b/src/Model/Model_AttributeDouble.h
@@ -1,17 +1,32 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_AttributeDouble.h
-// Created:     2 Apr 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #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.
@@ -19,7 +34,8 @@
 
 class Model_AttributeDouble : public ModelAPI_AttributeDouble
 {
-  Handle_TDataStd_Real myReal;  ///< double is Real attribute
+  std::shared_ptr<ModelAPI_ExpressionDouble> myExpression;
+
  public:
   /// Defines the double value
   MODEL_EXPORT virtual void setValue(const double theValue);
@@ -27,9 +43,41 @@ class Model_AttributeDouble : public ModelAPI_AttributeDouble
   /// Returns the 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
+  /// 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;
 };