X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point.cpp;h=5ddb96d9a526177ccf3aee157657314ee2cd6338;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=cb6b8d47df05f5fe8cae9e3d482dee6c104a8c84;hpb=e303d57e616d6f4f99abed086396f672904aa3e8;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point.cpp b/src/GeomData/GeomData_Point.cpp
index cb6b8d47d..5ddb96d9a 100644
--- a/src/GeomData/GeomData_Point.cpp
+++ b/src/GeomData/GeomData_Point.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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "GeomData_Point.h"
@@ -86,6 +85,7 @@ void GeomData_Point::setX(const double theX)
     setCalculatedValue(theX, 0, 0);
   } else if (x() != theX) {
     myExpression[0]->setValue(theX);
+    myExpression[0]->setText(L""); // uninitialize the text
     owner()->data()->sendAttributeUpdated(this);
   }
 }
@@ -96,6 +96,7 @@ void GeomData_Point::setY(const double theY)
     setCalculatedValue(0, theY, 0);
   } else if (y() != theY) {
     myExpression[1]->setValue(theY);
+    myExpression[1]->setText(L""); // uninitialize the text
     owner()->data()->sendAttributeUpdated(this);
   }
 }
@@ -107,6 +108,7 @@ void GeomData_Point::setZ(const double theZ)
   }
   else if (z() != theZ) {
     myExpression[2]->setValue(theZ);
+    myExpression[2]->setText(L""); // uninitialize the text
     owner()->data()->sendAttributeUpdated(this);
   }
 }
@@ -118,9 +120,9 @@ std::shared_ptr<GeomAPI_Pnt> GeomData_Point::pnt()
   return aResult;
 }
 
-void GeomData_Point::setText(const std::string& theX,
-                             const std::string& theY,
-                             const std::string& theZ)
+void GeomData_Point::setText(const std::wstring& theX,
+                             const std::wstring& theY,
+                             const std::wstring& theZ)
 {
   if (!myIsInitialized || textX() != theX || textY() != theY || textZ() != theZ) {
     myExpression[0]->setText(theX);
@@ -132,10 +134,10 @@ void GeomData_Point::setText(const std::string& theX,
   }
 }
 
-void GeomData_Point::setTextX(const std::string& theX)
+void GeomData_Point::setTextX(const std::wstring& theX)
 {
   if (!myIsInitialized) {
-    static const std::string aDefaultText = "0";
+    static const std::wstring aDefaultText = L"0";
     setText(theX, aDefaultText, aDefaultText);
   }
   else if (textX() != theX) {
@@ -146,10 +148,10 @@ void GeomData_Point::setTextX(const std::string& theX)
   }
 }
 
-void GeomData_Point::setTextY(const std::string& theY)
+void GeomData_Point::setTextY(const std::wstring& theY)
 {
   if (!myIsInitialized) {
-    static const std::string aDefaultText = "0";
+    static const std::wstring aDefaultText = L"0";
     setText(aDefaultText, theY, aDefaultText);
   }
   else if (textY() != theY) {
@@ -160,10 +162,10 @@ void GeomData_Point::setTextY(const std::string& theY)
   }
 }
 
-void GeomData_Point::setTextZ(const std::string& theZ)
+void GeomData_Point::setTextZ(const std::wstring& theZ)
 {
   if (!myIsInitialized) {
-    static const std::string aDefaultText = "0";
+    static const std::wstring aDefaultText = L"0";
     setText(aDefaultText, aDefaultText, theZ);
   }
   else if (textZ() != theZ) {
@@ -174,15 +176,15 @@ void GeomData_Point::setTextZ(const std::string& theZ)
   }
 }
 
-std::string GeomData_Point::textX()
+std::wstring GeomData_Point::textX()
 {
   return myExpression[0]->text();
 }
-std::string GeomData_Point::textY()
+std::wstring GeomData_Point::textY()
 {
   return myExpression[1]->text();
 }
-std::string GeomData_Point::textZ()
+std::wstring GeomData_Point::textZ()
 {
   return myExpression[2]->text();
 }
@@ -214,13 +216,13 @@ std::string GeomData_Point::expressionError(int theComponent)
 }
 
 void GeomData_Point::setUsedParameters(int theComponent,
-                                       const std::set<std::string>& theUsedParameters)
+                                       const std::set<std::wstring>& theUsedParameters)
 {
   assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
   myExpression[theComponent]->setUsedParameters(theUsedParameters);
 }
 
-std::set<std::string> GeomData_Point::usedParameters(int theComponent) const
+std::set<std::wstring> GeomData_Point::usedParameters(int theComponent) const
 {
   assert(theComponent >= 0 && theComponent < NUM_COMPONENTS);
   return myExpression[theComponent]->usedParameters();