X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Dir.cpp;h=d5272dda21f432786c2ca04ff8e983b99a7a5108;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=3800c938ce04ee810e1bca6d6ff858bd83114f28;hpb=cb88e1dde1ee17d21a66639ea73ac8cdee7b16eb;p=modules%2Fshaper.git diff --git a/src/GeomData/GeomData_Dir.cpp b/src/GeomData/GeomData_Dir.cpp index 3800c938c..d5272dda2 100644 --- a/src/GeomData/GeomData_Dir.cpp +++ b/src/GeomData/GeomData_Dir.cpp @@ -1,9 +1,12 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: GeomData_Dir.cxx // Created: 2 Apr 2014 // Author: Mikhail PONIKAROV #include "GeomData_Dir.h" -#include "GeomAPI_Dir.h" +#include +#include #include #include #include @@ -12,8 +15,8 @@ using namespace std; 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); @@ -21,10 +24,9 @@ void GeomData_Dir::setValue(const double theX, const double theY, const double t } } -void GeomData_Dir::setValue(const boost::shared_ptr& theDir) +void GeomData_Dir::setValue(const std::shared_ptr& theDir) { setValue(theDir->x(), theDir->y(), theDir->z()); - owner()->data()->sendAttributeUpdated(this); } double GeomData_Dir::x() const @@ -42,10 +44,16 @@ double GeomData_Dir::z() const return myCoords->Value(2); } -boost::shared_ptr GeomData_Dir::dir() +std::shared_ptr GeomData_Dir::dir() +{ + return std::shared_ptr( + new GeomAPI_Dir(myCoords->Value(0), myCoords->Value(1), myCoords->Value(2))); +} + +std::shared_ptr GeomData_Dir::xyz() { - return boost::shared_ptr(new GeomAPI_Dir( - myCoords->Value(0), myCoords->Value(1), myCoords->Value(2))); + return std::shared_ptr( + new GeomAPI_XYZ(myCoords->Value(0), myCoords->Value(1), myCoords->Value(2))); } GeomData_Dir::GeomData_Dir(TDF_Label& theLabel)