Merge commit 'f709219506b7cd587e94abc5ebed18d629df92d8'

[modules/shaper.git] / src / GeomData / GeomData_Point.h

diff --git a/src/GeomData/GeomData_Point.h b/src/GeomData/GeomData_Point.h
index 8936ffef82462bb4abdf1bac10f12fb502544f68..1aa3e967487bd4174123fad2fd77110ac275d86f 100644 (file)
--- a/src/GeomData/GeomData_Point.h
+++ b/src/GeomData/GeomData_Point.h
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomData_Point.h
-// Created:     24 Apr 2014
-// Author:      Mikhail PONIKAROV
+// 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
+// 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 GeomData_Point_H_
 #define GeomData_Point_H_
@@ -21,7 +34,8 @@ class ModelAPI_ExpressionDouble;
 class GeomData_Point : public GeomDataAPI_Point
 {
   enum { NUM_COMPONENTS = 3 };
-  std::shared_ptr<ModelAPI_ExpressionDouble> myExpression[NUM_COMPONENTS]; ///< Expressions for X, Y and Z 
+  /// Expressions for X, Y and Z
+  std::shared_ptr<ModelAPI_ExpressionDouble> myExpression[NUM_COMPONENTS];
  public:
   /// Defines the double value
   GEOMDATA_EXPORT virtual void setValue(const double theX, const double theY, const double theZ);
@@ -34,23 +48,37 @@ class GeomData_Point : public GeomDataAPI_Point
   GEOMDATA_EXPORT virtual double y() const;
   /// Returns the Z double value
   GEOMDATA_EXPORT virtual double z() const;
+  /// Defines the X coordinate value
+  GEOMDATA_EXPORT void setX(const double theX);
+  /// Defines the Y coordinate value
+  GEOMDATA_EXPORT void setY(const double theY);
+  /// Defines the Z coordinate value
+  GEOMDATA_EXPORT void setZ(const double theZ);
+
   /// Returns the 3D point
   GEOMDATA_EXPORT virtual std::shared_ptr<GeomAPI_Pnt> pnt();
 
   /// Defines the calculated double value
-  GEOMDATA_EXPORT virtual void setCalculatedValue(const double theX, const double theY, const double theZ);
+  GEOMDATA_EXPORT virtual
+    void setCalculatedValue(const double theX, const double theY, const double theZ);
 
   /// Defines the text values
-  GEOMDATA_EXPORT virtual void setText(const std::string& theX,
-                                       const std::string& theY,
-                                       const std::string& theZ);
+  GEOMDATA_EXPORT virtual void setText(const std::wstring& theX,
+                                       const std::wstring& theY,
+                                       const std::wstring& theZ);
+  /// Defines the X text value
+  GEOMDATA_EXPORT virtual void setTextX(const std::wstring& theX);
+  /// Defines the Y text value
+  GEOMDATA_EXPORT virtual void setTextY(const std::wstring& theY);
+  /// Defines the Z text value
+  GEOMDATA_EXPORT virtual void setTextZ(const std::wstring& theZ);
 
   /// Returns the X text value
-  GEOMDATA_EXPORT virtual std::string textX();
+  GEOMDATA_EXPORT virtual std::wstring textX();
   /// Returns the Y text value
-  GEOMDATA_EXPORT virtual std::string textY();
+  GEOMDATA_EXPORT virtual std::wstring textY();
   /// Returns the Z text value
-  GEOMDATA_EXPORT virtual std::string textZ();
+  GEOMDATA_EXPORT virtual std::wstring textZ();
 
   /// Allows to set expression (text) as invalid (by the parameters listener)
   GEOMDATA_EXPORT virtual void setExpressionInvalid(int, const bool theFlag);
@@ -65,11 +93,11 @@ class GeomData_Point : public GeomDataAPI_Point
   GEOMDATA_EXPORT virtual std::string expressionError(int theComponent);
 
   /// Defines the used parameters
-  GEOMDATA_EXPORT virtual void setUsedParameters(int theComponent, 
-    const std::set<std::string>& theUsedParameters);
+  GEOMDATA_EXPORT virtual void setUsedParameters(int theComponent,
+    const std::set<std::wstring>& theUsedParameters);
 
   /// Returns the used parameters
-  GEOMDATA_EXPORT virtual std::set<std::string> usedParameters(int theComponent) const;
+  GEOMDATA_EXPORT virtual std::set<std::wstring> usedParameters(int theComponent) const;
 
  protected:
   /// Initializes attributes