X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point2D.cpp;h=5061f8193ec6c8eb495116a788fb2395fb5239bb;hb=3960b241ef14948d0ec99a010263e3643e08a762;hp=8af702953a020f407e2360e2b054f1ec87f60820;hpb=ef0c6c6af8bec0578a0e8f7f12871e02988d4374;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point2D.cpp b/src/GeomData/GeomData_Point2D.cpp
index 8af702953..5061f8193 100644
--- a/src/GeomData/GeomData_Point2D.cpp
+++ b/src/GeomData/GeomData_Point2D.cpp
@@ -1,10 +1,13 @@
+// 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>
 
 using namespace std;
 
@@ -13,12 +16,15 @@ void GeomData_Point2D::setValue(const double theX, const double theY)
   if (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 std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
+{
+  setValue(thePoint->x(), thePoint->y());
+}
+
 double GeomData_Point2D::x() const
 {
   return myCoords->Value(0);
@@ -29,10 +35,17 @@ double GeomData_Point2D::y() const
   return myCoords->Value(1);
 }
 
+std::shared_ptr<GeomAPI_Pnt2d> GeomData_Point2D::pnt()
+{
+  std::shared_ptr<GeomAPI_Pnt2d> aResult(
+      new GeomAPI_Pnt2d(myCoords->Value(0), myCoords->Value(1)));
+  return aResult;
+}
+
 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 = theLabel.FindAttribute(TDataStd_RealArray::GetID(), myCoords) == Standard_True;
+  if (!myIsInitialized) {
     // create attribute: not initialized by value yet, just zero
     myCoords = TDataStd_RealArray::Set(theLabel, 0, 1);
   }