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 08913436c7f757ec2261079c299c16abc9c49e55..314a0ab79468c6d545e651dcdfa2a70b963b3ac2 100644
(file)
--- a/
src/GeomData/GeomData_Point2D.cpp
+++ b/
src/GeomData/GeomData_Point2D.cpp
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: GeomData_Point2D.cxx
// Created: 24 Apr 2014
// Author: Mikhail PONIKAROV
// File: GeomData_Point2D.cxx
// Created: 24 Apr 2014
// Author: Mikhail PONIKAROV
@@
-11,17
+13,16
@@
using namespace std;
void GeomData_Point2D::setValue(const double theX, const double theY)
{
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);
owner()->data()->sendAttributeUpdated(this);
}
}
myCoords->SetValue(0, theX);
myCoords->SetValue(1, theY);
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());
{
setValue(thePoint->x(), thePoint->y());
- owner()->data()->sendAttributeUpdated(this);
}
double GeomData_Point2D::x() const
}
double GeomData_Point2D::x() const
@@
-34,9
+35,9
@@
double GeomData_Point2D::y() const
return myCoords->Value(1);
}
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(
+
std
::shared_ptr<GeomAPI_Pnt2d> aResult(
new GeomAPI_Pnt2d(myCoords->Value(0), myCoords->Value(1)));
return aResult;
}
new GeomAPI_Pnt2d(myCoords->Value(0), myCoords->Value(1)));
return aResult;
}