X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point.cpp;h=2a2f52d80ea3e2b93de5f66eb0dd9cb6b9e19be6;hb=8d8878b385494638fbe5fad10bbcdee9c9d04f30;hp=6ad2ac56479b99942b5c4c2ac55be0947aedb3a9;hpb=59352d0f59edef8f37d436517f5b0c0fbecd7305;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point.cpp b/src/GeomData/GeomData_Point.cpp
index 6ad2ac564..2a2f52d80 100644
--- a/src/GeomData/GeomData_Point.cpp
+++ b/src/GeomData/GeomData_Point.cpp
@@ -1,26 +1,32 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomData_Point.cxx
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
 #include "GeomData_Point.h"
-#include "Model_Events.h"
-#include <Events_Loop.h>
 #include <GeomAPI_Pnt.h>
+#include <ModelAPI_Feature.h>
+#include <ModelAPI_Data.h>
 
 using namespace std;
 
 void GeomData_Point::setValue(const double theX, const double theY, const double theZ)
 {
-  if (myCoords->Value(0) != theX || myCoords->Value(1) != theY || myCoords->Value(2) != theZ) {
+  if (!myIsInitialized || myCoords->Value(0) != theX || myCoords->Value(1) != theY
+      || myCoords->Value(2) != theZ) {
     myCoords->SetValue(0, theX);
     myCoords->SetValue(1, theY);
     myCoords->SetValue(2, theZ);
-    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_Point::setValue(const std::shared_ptr<GeomAPI_Pnt>& thePoint)
+{
+  setValue(thePoint->x(), thePoint->y(), thePoint->z());
+}
+
 double GeomData_Point::x() const
 {
   return myCoords->Value(0);
@@ -36,17 +42,17 @@ 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(new GeomAPI_Pnt(
-    myCoords->Value(0), myCoords->Value(1), myCoords->Value(2)));
+  std::shared_ptr<GeomAPI_Pnt> aResult(
+      new GeomAPI_Pnt(myCoords->Value(0), myCoords->Value(1), myCoords->Value(2)));
   return aResult;
 }
 
 GeomData_Point::GeomData_Point(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, 2);
   }