X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point2D.cpp;h=e02de3eefd3f8ef0fd1237406bea959da05e5851;hb=b6f308f901ef00da365c40bab25c5f03b547adf0;hp=334d2070a320b1c19d0f9cf73450d143eca4f868;hpb=73c02c2103a34ec5d2ac48a345757dee0e0d42f9;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point2D.cpp b/src/GeomData/GeomData_Point2D.cpp
index 334d2070a..e02de3eef 100644
--- a/src/GeomData/GeomData_Point2D.cpp
+++ b/src/GeomData/GeomData_Point2D.cpp
@@ -1,26 +1,27 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomData_Point2D.cxx
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
 #include "GeomData_Point2D.h"
-#include "Model_Events.h"
-#include <Events_Loop.h>
 #include <GeomAPI_Pnt2d.h>
+#include <ModelAPI_Feature.h>
+#include <ModelAPI_Data.h>
+#include <ModelAPI_Events.h>
 
 using namespace std;
 
 void GeomData_Point2D::setValue(const double theX, const double theY)
 {
-  if (myCoords->Value(0) != theX || myCoords->Value(1) != theY) {
+  if (!myIsInitialized || myCoords->Value(0) != theX || myCoords->Value(1) != theY) {
     myCoords->SetValue(0, theX);
     myCoords->SetValue(1, theY);
-    static Events_ID anEvent = Events_Loop::eventByName(EVENT_FEATURE_UPDATED);
-    Model_FeatureUpdatedMessage aMsg(owner(), anEvent);
-    Events_Loop::loop()->send(aMsg);
+    owner()->data()->sendAttributeUpdated(this);
   }
 }
 
-void GeomData_Point2D::setValue(const boost::shared_ptr<GeomAPI_Pnt2d>& thePoint)
+void GeomData_Point2D::setValue(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
 {
   setValue(thePoint->x(), thePoint->y());
 }
@@ -35,18 +36,68 @@ double GeomData_Point2D::y() const
   return myCoords->Value(1);
 }
 
-boost::shared_ptr<GeomAPI_Pnt2d> GeomData_Point2D::pnt()
+std::shared_ptr<GeomAPI_Pnt2d> GeomData_Point2D::pnt()
 {
-  boost::shared_ptr<GeomAPI_Pnt2d> aResult(
-    new GeomAPI_Pnt2d(myCoords->Value(0), myCoords->Value(1)));
+  std::shared_ptr<GeomAPI_Pnt2d> aResult(
+      new GeomAPI_Pnt2d(myCoords->Value(0), myCoords->Value(1)));
   return aResult;
 }
 
+void GeomData_Point2D::setText(const std::string& theX,
+                               const std::string& theY)
+{
+  TCollection_ExtendedString aX(theX.c_str());
+  TCollection_ExtendedString aY(theY.c_str());
+
+  if (!myIsInitialized ||
+      myTextArray->Value(0) != aX ||
+      myTextArray->Value(1) != aY) {
+    myTextArray->SetValue(0, aX);
+    myTextArray->SetValue(1, aY);
+    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_Point2D::textX()
+{
+  return TCollection_AsciiString(myTextArray->Value(0)).ToCString();;
+}
+std::string GeomData_Point2D::textY()
+{
+  return TCollection_AsciiString(myTextArray->Value(1)).ToCString();;
+}
+
+void GeomData_Point2D::setExpressionInvalid(int theComponent, bool theFlag)
+{
+  if (!myIsInitialized || myExpressionInvalidArray->Value(theComponent) != theFlag) {
+    myExpressionInvalidArray->SetValue(theComponent, theFlag);
+  }
+}
+
+bool GeomData_Point2D::expressionInvalid(int theComponent)
+{
+  return myExpressionInvalidArray->Value(theComponent);
+}
+
 GeomData_Point2D::GeomData_Point2D(TDF_Label& theLabel)
 {
-  // check the attribute could be already presented in this doc (after load document)
-  if (!theLabel.FindAttribute(TDataStd_RealArray::GetID(), myCoords)) {
+  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, 1);
+    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, 1);
+    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, 1);
+    myIsInitialized = false;
   }
 }