bos #29477 Merge branch 'CR29477'

[modules/shaper.git] / src / GeomDataAPI / GeomDataAPI_Point.h

diff --git a/src/GeomDataAPI/GeomDataAPI_Point.h b/src/GeomDataAPI/GeomDataAPI_Point.h
index 594ad82cb7f0b76b1c16c711c12b538af61dfcb3..358a04aa534a9f3cea696966a5c11a615b6f68ee 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI_Point.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  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
@@ -12,9 +12,9 @@
 //
 // 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef GeomDataAPI_Point_H_
@@ -54,17 +54,31 @@ class GeomDataAPI_Point : public ModelAPI_Attribute
   GEOMDATAAPI_EXPORT virtual
     void setCalculatedValue(const double theX, const double theY, const double theZ) = 0;
 
+  /// Defines the X coordinate value
+  GEOMDATAAPI_EXPORT virtual void setX(const double theX) = 0;
+  /// Defines the Y coordinate value
+  GEOMDATAAPI_EXPORT virtual void setY(const double theY) = 0;
+  /// Defines the Z coordinate value
+  GEOMDATAAPI_EXPORT virtual void setZ(const double theZ) = 0;
+
   /// Defines the text values
-  GEOMDATAAPI_EXPORT virtual void setText(const std::string& theX,
-                                          const std::string& theY,
-                                          const std::string& theZ) = 0;
+  GEOMDATAAPI_EXPORT virtual void setText(const std::wstring& theX,
+                                          const std::wstring& theY,
+                                          const std::wstring& theZ) = 0;
+
+  /// Defines the X text value
+  GEOMDATAAPI_EXPORT virtual void setTextX(const std::wstring& theX) = 0;
+  /// Defines the Y text value
+  GEOMDATAAPI_EXPORT virtual void setTextY(const std::wstring& theY) = 0;
+  /// Defines the Z text value
+  GEOMDATAAPI_EXPORT virtual void setTextZ(const std::wstring& theZ) = 0;
 
   /// Returns the text value for X
-  GEOMDATAAPI_EXPORT virtual std::string textX() = 0;
+  GEOMDATAAPI_EXPORT virtual std::wstring textX() = 0;
   /// Returns the text value for Y
-  GEOMDATAAPI_EXPORT virtual std::string textY() = 0;
+  GEOMDATAAPI_EXPORT virtual std::wstring textY() = 0;
   /// Returns the text value for Z
-  GEOMDATAAPI_EXPORT virtual std::string textZ() = 0;
+  GEOMDATAAPI_EXPORT virtual std::wstring textZ() = 0;
 
   /// Point component (x,y,z)
   enum PointComponent { C_X = 0,
@@ -87,10 +101,10 @@ class GeomDataAPI_Point : public ModelAPI_Attribute
 
   /// Defines the used parameters
   GEOMDATAAPI_EXPORT virtual void setUsedParameters(int theComponent,
-    const std::set<std::string>& theUsedParameters) = 0;
+    const std::set<std::wstring>& theUsedParameters) = 0;
 
   /// Returns the used parameters
-  GEOMDATAAPI_EXPORT virtual std::set<std::string> usedParameters(int theComponent) const = 0;
+  GEOMDATAAPI_EXPORT virtual std::set<std::wstring> usedParameters(int theComponent) const = 0;
 
   /// Returns the type of this class of attributes
   static std::string typeId()