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 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1
[modules/shaper.git]
/
src
/
GeomData
/
GeomData_Dir.cpp
diff --git
a/src/GeomData/GeomData_Dir.cpp
b/src/GeomData/GeomData_Dir.cpp
index 3800c938ce04ee810e1bca6d6ff858bd83114f28..d36e8a8f5c84685b7b3d6fbc879ee6aa03ca2fa2 100644
(file)
--- a/
src/GeomData/GeomData_Dir.cpp
+++ b/
src/GeomData/GeomData_Dir.cpp
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: GeomData_Dir.cxx
// Created: 2 Apr 2014
// Author: Mikhail PONIKAROV
// File: GeomData_Dir.cxx
// Created: 2 Apr 2014
// Author: Mikhail PONIKAROV
@@
-12,8
+14,8
@@
using namespace std;
void GeomData_Dir::setValue(const double theX, const double theY, const double theZ)
{
void GeomData_Dir::setValue(const double theX, const double theY, const double theZ)
{
- if (!myIsInitialized || 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);
myCoords->SetValue(0, theX);
myCoords->SetValue(1, theY);
myCoords->SetValue(2, theZ);
@@
-21,10
+23,9
@@
void GeomData_Dir::setValue(const double theX, const double theY, const double t
}
}
}
}
-void GeomData_Dir::setValue(const
boost
::shared_ptr<GeomAPI_Dir>& theDir)
+void GeomData_Dir::setValue(const
std
::shared_ptr<GeomAPI_Dir>& theDir)
{
setValue(theDir->x(), theDir->y(), theDir->z());
{
setValue(theDir->x(), theDir->y(), theDir->z());
- owner()->data()->sendAttributeUpdated(this);
}
double GeomData_Dir::x() const
}
double GeomData_Dir::x() const
@@
-42,10
+43,10
@@
double GeomData_Dir::z() const
return myCoords->Value(2);
}
return myCoords->Value(2);
}
-
boost
::shared_ptr<GeomAPI_Dir> GeomData_Dir::dir()
+
std
::shared_ptr<GeomAPI_Dir> GeomData_Dir::dir()
{
{
- return
boost::shared_ptr<GeomAPI_Dir>(new GeomAPI_Dir
(
- myCoords->Value(0), myCoords->Value(1), myCoords->Value(2)));
+ return
std::shared_ptr<GeomAPI_Dir>
(
+
new GeomAPI_Dir(
myCoords->Value(0), myCoords->Value(1), myCoords->Value(2)));
}
GeomData_Dir::GeomData_Dir(TDF_Label& theLabel)
}
GeomData_Dir::GeomData_Dir(TDF_Label& theLabel)