X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Expression.h;h=53d7a502785e58095a2e2580755ea338c3219867;hb=4635fa2d17f7d9cca2892169b7372ffa37cd2180;hp=4e48d15cc6cdcb378082a5b04e952d430c058325;hpb=70f8434967195327040485995ca62b40d029e7ab;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Expression.h b/src/Model/Model_Expression.h
index 4e48d15cc..53d7a5027 100644
--- a/src/Model/Model_Expression.h
+++ b/src/Model/Model_Expression.h
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_Expression.h
-// Created:     5 Aug 2015
-// Author:      Sergey POKHODENKO
+// Copyright (C) 2014-2020  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_Expression_H_
 #define Model_Expression_H_
@@ -50,8 +63,7 @@ class Model_Expression : public virtual ModelAPI_Expression
   Handle_TDataStd_Name myText; ///< Text representation of the attribute (may differ for parameters)
   Handle_TDataStd_Comment myError; ///< Error of expression of the text attribute
   Handle_TDataStd_ExtStringList myUsedParameters; ///< Parameters used in expression
-
-  friend class Model_Data;
+  TDF_Label myLab; ///< if attribute is not initialized, store label here
 };
 
 
@@ -64,6 +76,36 @@ class Model_ExpressionDouble :
     public ModelAPI_ExpressionDouble
 {
  public:
+  /// Sets the text of this Expression
+  MODEL_EXPORT virtual void setText(const std::string& theText) {
+    Model_Expression::setText(theText);
+  };
+
+  /// Returns the text of this Expression
+  MODEL_EXPORT virtual std::string text() const {
+    return Model_Expression::text();
+  };
+
+  /// Allows to set expression (text) error (by the parameters listener)
+  MODEL_EXPORT virtual void setError(const std::string& theError) {
+    Model_Expression::setError(theError);
+  };
+
+  /// Returns an expression error
+  MODEL_EXPORT virtual std::string error() {
+    return Model_Expression::error();
+  };
+
+  /// Defines the used parameters (by the parameters listener)
+  MODEL_EXPORT virtual void setUsedParameters(const std::set<std::string>& theUsedParameters) {
+    Model_Expression::setUsedParameters(theUsedParameters);
+  };
+
+  /// Returns the used parameters
+  MODEL_EXPORT virtual std::set<std::string> usedParameters() const {
+    return Model_Expression::usedParameters();
+  };
+
   /// Defines the double value
   MODEL_EXPORT virtual void setValue(const double theValue);
 
@@ -79,7 +121,10 @@ class Model_ExpressionDouble :
  protected:
   /// Initializes attributes
   Model_ExpressionDouble(TDF_Label& theLabel);
+  /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc)
+  virtual void reinit();
 
+  friend class Model_AttributeDouble;
   friend class Model_Data;
 
  private:
@@ -96,6 +141,36 @@ class Model_ExpressionInteger :
     public ModelAPI_ExpressionInteger
 {
  public:
+  /// Sets the text of this Expression
+  MODEL_EXPORT virtual void setText(const std::string& theText) {
+    Model_Expression::setText(theText);
+  };
+
+  /// Returns the text of this Expression
+  MODEL_EXPORT virtual std::string text() const {
+    return Model_Expression::text();
+  };
+
+  /// Allows to set expression (text) error (by the parameters listener)
+  MODEL_EXPORT virtual void setError(const std::string& theError) {
+    Model_Expression::setError(theError);
+  };
+
+  /// Returns an expression error
+  MODEL_EXPORT virtual std::string error() {
+    return Model_Expression::error();
+  };
+
+  /// Defines the used parameters (by the parameters listener)
+  MODEL_EXPORT virtual void setUsedParameters(const std::set<std::string>& theUsedParameters) {
+    Model_Expression::setUsedParameters(theUsedParameters);
+  };
+
+  /// Returns the used parameters
+  MODEL_EXPORT virtual std::set<std::string> usedParameters() const {
+    return Model_Expression::usedParameters();
+  };
+
   /// Defines the integer value
   MODEL_EXPORT virtual void setValue(const int theValue);
 
@@ -111,8 +186,10 @@ class Model_ExpressionInteger :
  protected:
   /// Initializes attributes
   Model_ExpressionInteger(TDF_Label& theLabel);
+  /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc)
+  virtual void reinit();
 
-  friend class Model_Data;
+  friend class Model_AttributeInteger;
 
  private:
   Handle_TDataStd_Integer myInteger;