Merge commit 'f709219506b7cd587e94abc5ebed18d629df92d8'

[modules/shaper.git] / src / InitializationPlugin / InitializationPlugin_EvalListener.h

diff --git a/src/InitializationPlugin/InitializationPlugin_EvalListener.h b/src/InitializationPlugin/InitializationPlugin_EvalListener.h
index 5b6f3d7be7cf7a5b59378166204790a5ebcbaf69..f9c16065652db592dadd009b60b24f9c2d4e2634 100644 (file)
--- a/src/InitializationPlugin/InitializationPlugin_EvalListener.h
+++ b/src/InitializationPlugin/InitializationPlugin_EvalListener.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022  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
@@ -50,11 +50,21 @@ class InitializationPlugin_EvalListener : public Events_Listener
 
  protected:
   /// Evaluates theExpression and returns its value.
-   double evaluate(std::shared_ptr<ModelAPI_Feature> theParameter,
-                  const std::string& theExpression, std::string& theError,
+  double evaluate(std::shared_ptr<ModelAPI_Feature> theParameter,
+                  const std::wstring& theExpression, std::string& theError,
                   std::list<std::shared_ptr<ModelAPI_ResultParameter> >& theParamsList,
                   const bool theIsParameter = false);
 
+  /// Evaluates theExpression with variable local and returns its value.
+  double evaluate(std::wstring& theVariable,
+                  double theValueVariable,
+                  std::shared_ptr<ModelAPI_Feature> theParameter,
+                  const std::wstring& theExpression,
+                  std::string& theError,
+                  std::list<std::shared_ptr<ModelAPI_ResultParameter> >& theParamsList,
+                  bool theIsFirstTime);
+
+
   /// Processes Evaluation event.
   void processEvaluationEvent(const std::shared_ptr<Events_Message>& theMessage);