Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of newgeom:newgeom
[modules/shaper.git]
/
src
/
GeomData
/
GeomData_Point2D.cpp
diff --git
a/src/GeomData/GeomData_Point2D.cpp
b/src/GeomData/GeomData_Point2D.cpp
index bbf3e55fb578d27d567beb57409ce69f80ff9457..314a0ab79468c6d545e651dcdfa2a70b963b3ac2 100644
(file)
--- a/
src/GeomData/GeomData_Point2D.cpp
+++ b/
src/GeomData/GeomData_Point2D.cpp
@@
-1,24
+1,30
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: GeomData_Point2D.cxx
// Created: 24 Apr 2014
// Author: Mikhail PONIKAROV
#include "GeomData_Point2D.h"
// 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;
void GeomData_Point2D::setValue(const double theX, const double theY)
{
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);
myCoords->SetValue(0, theX);
myCoords->SetValue(1, theY);
- static Events_ID anEvent = Events_Loop::eventByName(EVENT_FEATURE_UPDATED);
- Model_FeatureUpdatedMessage aMsg(feature(), 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);
double GeomData_Point2D::x() const
{
return myCoords->Value(0);
@@
-29,10
+35,17
@@
double GeomData_Point2D::y() const
return myCoords->Value(1);
}
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)
{
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);
}
// create attribute: not initialized by value yet, just zero
myCoords = TDataStd_RealArray::Set(theLabel, 0, 1);
}