X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point.cpp;h=7ae96b859bb5ddf46a17392e669e785868ff625a;hb=b6f308f901ef00da365c40bab25c5f03b547adf0;hp=61c92e12bbed4730cae31908d8eb7e781168efd0;hpb=93152527420704cf35e22b11d1de198e1710bd90;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point.cpp b/src/GeomData/GeomData_Point.cpp
index 61c92e12b..7ae96b859 100644
--- a/src/GeomData/GeomData_Point.cpp
+++ b/src/GeomData/GeomData_Point.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomData_Point.cxx
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -6,6 +8,7 @@
 #include <GeomAPI_Pnt.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>
+#include <ModelAPI_Events.h>
 
 using namespace std;
 
@@ -20,7 +23,7 @@ void GeomData_Point::setValue(const double theX, const double theY, const double
   }
 }
 
-void GeomData_Point::setValue(const boost::shared_ptr<GeomAPI_Pnt>& thePoint)
+void GeomData_Point::setValue(const std::shared_ptr<GeomAPI_Pnt>& thePoint)
 {
   setValue(thePoint->x(), thePoint->y(), thePoint->z());
 }
@@ -40,18 +43,76 @@ double GeomData_Point::z() const
   return myCoords->Value(2);
 }
 
-boost::shared_ptr<GeomAPI_Pnt> GeomData_Point::pnt()
+std::shared_ptr<GeomAPI_Pnt> GeomData_Point::pnt()
 {
-  boost::shared_ptr<GeomAPI_Pnt> aResult(
+  std::shared_ptr<GeomAPI_Pnt> aResult(
       new GeomAPI_Pnt(myCoords->Value(0), myCoords->Value(1), myCoords->Value(2)));
   return aResult;
 }
 
+void GeomData_Point::setText(const std::string& theX,
+                             const std::string& theY,
+                             const std::string& theZ)
+{
+  TCollection_ExtendedString aX(theX.c_str());
+  TCollection_ExtendedString aY(theY.c_str());
+  TCollection_ExtendedString aZ(theZ.c_str());
+
+  if (!myIsInitialized ||
+      myTextArray->Value(0) != aX ||
+      myTextArray->Value(1) != aY ||
+      myTextArray->Value(2) != aZ) {
+    myTextArray->SetValue(0, aX);
+    myTextArray->SetValue(1, aY);
+    myTextArray->SetValue(2, aZ);
+    owner()->data()->sendAttributeUpdated(this);
+    // Send it to evaluator to convert into the double and store in the attribute
+    ModelAPI_AttributeEvalMessage::send(owner()->data()->attribute(id()), this);
+  }
+}
+
+std::string GeomData_Point::textX()
+{
+  return TCollection_AsciiString(myTextArray->Value(0)).ToCString();;
+}
+std::string GeomData_Point::textY()
+{
+  return TCollection_AsciiString(myTextArray->Value(1)).ToCString();;
+}
+std::string GeomData_Point::textZ()
+{
+  return TCollection_AsciiString(myTextArray->Value(2)).ToCString();;
+}
+
+void GeomData_Point::setExpressionInvalid(int theComponent, bool theFlag)
+{
+  if (!myIsInitialized || myExpressionInvalidArray->Value(theComponent) != theFlag) {
+    myExpressionInvalidArray->SetValue(theComponent, theFlag);
+  }
+}
+
+bool GeomData_Point::expressionInvalid(int theComponent)
+{
+  return myExpressionInvalidArray->Value(theComponent);
+}
+
 GeomData_Point::GeomData_Point(TDF_Label& theLabel)
 {
-  myIsInitialized = theLabel.FindAttribute(TDataStd_RealArray::GetID(), myCoords) == Standard_True;
-  if (!myIsInitialized) {
+  myIsInitialized = true;
+
+  if (theLabel.FindAttribute(TDataStd_RealArray::GetID(), myCoords) != Standard_True) {
     // create attribute: not initialized by value yet, just zero
     myCoords = TDataStd_RealArray::Set(theLabel, 0, 2);
+    myIsInitialized = false;
+  }
+  if (theLabel.FindAttribute(TDataStd_ExtStringArray::GetID(), myTextArray) != Standard_True) {
+    // create attribute: not initialized by value yet, just zero
+    myTextArray = TDataStd_ExtStringArray::Set(theLabel, 0, 2);
+    myIsInitialized = false;
+  }
+  if (theLabel.FindAttribute(TDataStd_BooleanArray::GetID(), myExpressionInvalidArray) != Standard_True) {
+    // create attribute: not initialized by value yet, just zero
+    myExpressionInvalidArray = TDataStd_BooleanArray::Set(theLabel, 0, 2);
+    myIsInitialized = false;
   }
 }