X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGeomAPI%2FGeomAPI_Dir.cpp;h=6f57e76815be685afaf7de7fdd399aaceead0348;hb=73502ac782ffc45a3acf665ded34f582b07ec4d5;hp=e3badb4401b41cdd0fc5a2f7f3bd3712ca172f08;hpb=b035864efaaa03ffcf5a3aa32d20f84f5d6ddc58;p=modules%2Fshaper.git diff --git a/src/GeomAPI/GeomAPI_Dir.cpp b/src/GeomAPI/GeomAPI_Dir.cpp index e3badb440..6f57e7681 100644 --- a/src/GeomAPI/GeomAPI_Dir.cpp +++ b/src/GeomAPI/GeomAPI_Dir.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: GeomAPI_Dir.cpp // Created: 23 Apr 2014 // Author: Mikhail PONIKAROV @@ -7,15 +9,17 @@ #include -#define MY_DIR static_cast(myImpl) +#define MY_DIR implPtr() GeomAPI_Dir::GeomAPI_Dir(const double theX, const double theY, const double theZ) - : GeomAPI_Interface(new gp_Dir(theX, theY, theZ)) -{} + : GeomAPI_Interface(new gp_Dir(theX, theY, theZ)) +{ +} -GeomAPI_Dir::GeomAPI_Dir(const boost::shared_ptr& theCoords) - : GeomAPI_Interface(new gp_Dir(theCoords->x(), theCoords->y(), theCoords->z())) -{} +GeomAPI_Dir::GeomAPI_Dir(const std::shared_ptr& theCoords) + : GeomAPI_Interface(new gp_Dir(theCoords->x(), theCoords->y(), theCoords->z())) +{ +} double GeomAPI_Dir::x() const { @@ -32,19 +36,30 @@ double GeomAPI_Dir::z() const return MY_DIR->Z(); } -const boost::shared_ptr GeomAPI_Dir::xyz() +const std::shared_ptr GeomAPI_Dir::xyz() { - return boost::shared_ptr(new GeomAPI_XYZ(MY_DIR->X(), MY_DIR->Y(), MY_DIR->Z())); + return std::shared_ptr(new GeomAPI_XYZ(MY_DIR->X(), MY_DIR->Y(), MY_DIR->Z())); } -double GeomAPI_Dir::dot(const boost::shared_ptr& theArg) const +void GeomAPI_Dir::reverse() +{ + MY_DIR->Reverse(); +} + +double GeomAPI_Dir::dot(const std::shared_ptr& theArg) const { return MY_DIR->Dot(theArg->impl()); } -const boost::shared_ptr GeomAPI_Dir::cross(const boost::shared_ptr& theArg) const +const std::shared_ptr GeomAPI_Dir::cross( + const std::shared_ptr& theArg) const { gp_XYZ aResult = MY_DIR->XYZ().Crossed(theArg->impl().XYZ()); - return boost::shared_ptr(new GeomAPI_XYZ(aResult.X(), aResult.Y(), aResult.Z())); + return std::shared_ptr(new GeomAPI_XYZ(aResult.X(), aResult.Y(), aResult.Z())); +} + +double GeomAPI_Dir::angle(const std::shared_ptr& theArg) const +{ + return MY_DIR->Angle(theArg->impl()); }