X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGeomData%2FGeomData_Point2D.cpp;h=0efb595a3711f74801dbb8a955884e7cf2282c6f;hb=8f8cca340a8eb75d742c2e34c4265dd5b3f56628;hp=d2a00bf5a873a085601fc494780119cf1ca42c98;hpb=c4eab94a20a0d93100549a210582d46409fec1cc;p=modules%2Fshaper.git diff --git a/src/GeomData/GeomData_Point2D.cpp b/src/GeomData/GeomData_Point2D.cpp index d2a00bf5a..0efb595a3 100644 --- a/src/GeomData/GeomData_Point2D.cpp +++ b/src/GeomData/GeomData_Point2D.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 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 @@ -86,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 @@ -100,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(); } @@ -136,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();