X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point2D.cpp;h=8e9ed8ecc89a1e8c04e6e9a7275718ce00fc2eb0;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=3fbd659d11ef7e734fd773525b86e99f886fb42d;hpb=a94fc319f2aa64b43c9a73b5ff7063923648faec;p=modules%2Fshaper.git diff --git a/src/GeomData/GeomData_Point2D.cpp b/src/GeomData/GeomData_Point2D.cpp index 3fbd659d1..8e9ed8ecc 100644 --- a/src/GeomData/GeomData_Point2D.cpp +++ b/src/GeomData/GeomData_Point2D.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 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,10 +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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GeomData_Point2D.h" @@ -87,8 +86,8 @@ std::shared_ptr GeomData_Point2D::pnt() return aResult; } -void GeomData_Point2D::setText(const std::string& theX, - const std::string& theY) +void GeomData_Point2D::setText(const std::wstring& theX, + const std::wstring& theY) { if (!myIsInitialized && theX.empty() && theY.empty()) return; // empty strings are not good initializers @@ -101,11 +100,11 @@ void GeomData_Point2D::setText(const std::string& theX, } } -std::string GeomData_Point2D::textX() +std::wstring GeomData_Point2D::textX() { return myExpression[0]->text(); } -std::string GeomData_Point2D::textY() +std::wstring GeomData_Point2D::textY() { return myExpression[1]->text(); } @@ -137,13 +136,13 @@ std::string GeomData_Point2D::expressionError(int theComponent) } void GeomData_Point2D::setUsedParameters(int theComponent, - const std::set& theUsedParameters) + const std::set& theUsedParameters) { assert(theComponent >= 0 && theComponent < NUM_COMPONENTS); myExpression[theComponent]->setUsedParameters(theUsedParameters); } -std::set GeomData_Point2D::usedParameters(int theComponent) const +std::set GeomData_Point2D::usedParameters(int theComponent) const { assert(theComponent >= 0 && theComponent < NUM_COMPONENTS); return myExpression[theComponent]->usedParameters();