X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeDouble.h;h=b1dbfaa018624ba1fd1e54d46d788d0a80dfa360;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=d93b6067364fe217044b959ea469f935315c11ef;hpb=32f6c2d8959088d7083711d79ffb7bdc8426f4c7;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeDouble.h b/src/Model/Model_AttributeDouble.h
index d93b60673..b1dbfaa01 100644
--- a/src/Model/Model_AttributeDouble.h
+++ b/src/Model/Model_AttributeDouble.h
@@ -1,18 +1,31 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_AttributeDouble.h
-// Created:     2 Apr 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2023  CEA, EDF
+//
+// 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>
 
-#include <TDataStd_Name.hxx>
+class ModelAPI_ExpressionDouble;
 
 /**\class Model_AttributeDouble
  * \ingroup DataModel
@@ -21,8 +34,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);
@@ -34,10 +47,10 @@ class Model_AttributeDouble : public ModelAPI_AttributeDouble
   MODEL_EXPORT virtual void setCalculatedValue(const double theValue);
 
   /// Defines the text value
-  MODEL_EXPORT virtual void setText(const std::string& theText);
+  MODEL_EXPORT virtual void setText(const std::wstring& theText);
 
   /// Returns the text value
-  MODEL_EXPORT virtual std::string text();
+  MODEL_EXPORT virtual std::wstring text();
 
   /// Allows to set expression (text) as invalid (by the parameters listener)
   MODEL_EXPORT virtual void setExpressionInvalid(const bool theFlag);
@@ -45,9 +58,26 @@ 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::wstring>& theUsedParameters);
+
+  /// Returns the used parameters
+  MODEL_EXPORT virtual std::set<std::wstring> 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;
 };