X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGeomAPI%2FGeomAPI_Dir2d.cpp;h=4cb8149a3999d46e55c58e674aff32820fe3523e;hb=b2fc3132f3010bb1ebc54fff534cda6bb53e89b3;hp=e3089d8b95afb74937a5d45077f26876c24c1d73;hpb=cd9217d7e87997ec8bc150a6d8c389e742ca0f84;p=modules%2Fshaper.git diff --git a/src/GeomAPI/GeomAPI_Dir2d.cpp b/src/GeomAPI/GeomAPI_Dir2d.cpp index e3089d8b9..4cb8149a3 100644 --- a/src/GeomAPI/GeomAPI_Dir2d.cpp +++ b/src/GeomAPI/GeomAPI_Dir2d.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: GeomAPI_Dir2d.cpp // Created: 23 Apr 2014 // Author: Mikhail PONIKAROV @@ -7,14 +9,14 @@ #include -#define MY_DIR static_cast(myImpl) +#define MY_DIR implPtr() GeomAPI_Dir2d::GeomAPI_Dir2d(const double theX, const double theY) : GeomAPI_Interface(new gp_Dir2d(theX, theY)) { } -GeomAPI_Dir2d::GeomAPI_Dir2d(const boost::shared_ptr& theCoords) +GeomAPI_Dir2d::GeomAPI_Dir2d(const std::shared_ptr& theCoords) : GeomAPI_Interface(new gp_Dir2d(theCoords->x(), theCoords->y())) { } @@ -29,18 +31,22 @@ double GeomAPI_Dir2d::y() const return MY_DIR->Y(); } -const boost::shared_ptr GeomAPI_Dir2d::xy() +const std::shared_ptr GeomAPI_Dir2d::xy() { - return boost::shared_ptr(new GeomAPI_XY(MY_DIR->X(), MY_DIR->Y())); + return std::shared_ptr(new GeomAPI_XY(MY_DIR->X(), MY_DIR->Y())); } -double GeomAPI_Dir2d::dot(const boost::shared_ptr& theArg) const +double GeomAPI_Dir2d::dot(const std::shared_ptr& theArg) const { return MY_DIR->Dot(theArg->impl()); } -double GeomAPI_Dir2d::cross(const boost::shared_ptr& theArg) const +double GeomAPI_Dir2d::cross(const std::shared_ptr& theArg) const { return MY_DIR->XY().Crossed(theArg->impl().XY()); } +double GeomAPI_Dir2d::angle(const std::shared_ptr& theArg) const +{ + return MY_DIR->Angle(theArg->impl()); +}