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

diff --git a/src/GeomData/GeomData_Point.cpp b/src/GeomData/GeomData_Point.cpp
index 8f5923df1..5ddb96d9a 100644
--- a/src/GeomData/GeomData_Point.cpp
+++ b/src/GeomData/GeomData_Point.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomData_Point.cxx
-// Created:     24 Apr 2014
-// Author:      Mikhail PONIKAROV
+// 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
+// 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
+//
 
 #include "GeomData_Point.h"
 
@@ -66,15 +79,50 @@ double GeomData_Point::z() const
   return myExpression[2]->value();
 }
 
+void GeomData_Point::setX(const double theX)
+{
+  if (!myIsInitialized) {
+    setCalculatedValue(theX, 0, 0);
+  } else if (x() != theX) {
+    myExpression[0]->setValue(theX);
+    myExpression[0]->setText(L""); // uninitialize the text
+    owner()->data()->sendAttributeUpdated(this);
+  }
+}
+
+void GeomData_Point::setY(const double theY)
+{
+  if (!myIsInitialized) {
+    setCalculatedValue(0, theY, 0);
+  } else if (y() != theY) {
+    myExpression[1]->setValue(theY);
+    myExpression[1]->setText(L""); // uninitialize the text
+    owner()->data()->sendAttributeUpdated(this);
+  }
+}
+
+void GeomData_Point::setZ(const double theZ)
+{
+  if (!myIsInitialized) {
+    setCalculatedValue(0, 0, theZ);
+  }
+  else if (z() != theZ) {
+    myExpression[2]->setValue(theZ);
+    myExpression[2]->setText(L""); // uninitialize the text
+    owner()->data()->sendAttributeUpdated(this);
+  }
+}
+
+
 std::shared_ptr<GeomAPI_Pnt> GeomData_Point::pnt()
 {
   std::shared_ptr<GeomAPI_Pnt> aResult(new GeomAPI_Pnt(x(), y(), z()));
   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);
@@ -86,15 +134,57 @@ void GeomData_Point::setText(const std::string& theX,
   }
 }
 
-std::string GeomData_Point::textX()
+void GeomData_Point::setTextX(const std::wstring& theX)
+{
+  if (!myIsInitialized) {
+    static const std::wstring aDefaultText = L"0";
+    setText(theX, aDefaultText, aDefaultText);
+  }
+  else if (textX() != theX) {
+    myExpression[0]->setText(theX);
+    // Send it to evaluator to convert into the double and store in the attribute
+    ModelAPI_AttributeEvalMessage::send(owner()->data()->attribute(id()), this);
+    owner()->data()->sendAttributeUpdated(this);
+  }
+}
+
+void GeomData_Point::setTextY(const std::wstring& theY)
+{
+  if (!myIsInitialized) {
+    static const std::wstring aDefaultText = L"0";
+    setText(aDefaultText, theY, aDefaultText);
+  }
+  else if (textY() != theY) {
+    myExpression[1]->setText(theY);
+    // Send it to evaluator to convert into the double and store in the attribute
+    ModelAPI_AttributeEvalMessage::send(owner()->data()->attribute(id()), this);
+    owner()->data()->sendAttributeUpdated(this);
+  }
+}
+
+void GeomData_Point::setTextZ(const std::wstring& theZ)
+{
+  if (!myIsInitialized) {
+    static const std::wstring aDefaultText = L"0";
+    setText(aDefaultText, aDefaultText, theZ);
+  }
+  else if (textZ() != theZ) {
+    myExpression[2]->setText(theZ);
+    // Send it to evaluator to convert into the double and store in the attribute
+    ModelAPI_AttributeEvalMessage::send(owner()->data()->attribute(id()), this);
+    owner()->data()->sendAttributeUpdated(this);
+  }
+}
+
+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();
 }
@@ -126,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();