X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Lin.cpp;h=27bd3e0e297fdee97d63db8ed18e4d9ed2661d41;hb=0448acdd8e8c1e1638a2cf861e42e915966b2034;hp=58095f0e8f1432d4b10086ad5a48634549da044d;hpb=8dc74f82810d5f597b78633b457efb0ef4f89f9f;p=modules%2Fshaper.git diff --git a/src/GeomAPI/GeomAPI_Lin.cpp b/src/GeomAPI/GeomAPI_Lin.cpp index 58095f0e8..27bd3e0e2 100644 --- a/src/GeomAPI/GeomAPI_Lin.cpp +++ b/src/GeomAPI/GeomAPI_Lin.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: GeomAPI_Lin.cpp // Created: 29 May 2014 // Author: Artem ZHIDKOV @@ -33,23 +35,23 @@ GeomAPI_Lin::GeomAPI_Lin(const double theStartX, const double theStartY, const d { } -GeomAPI_Lin::GeomAPI_Lin(const boost::shared_ptr& theStart, - const boost::shared_ptr& theEnd) +GeomAPI_Lin::GeomAPI_Lin(const std::shared_ptr& theStart, + const std::shared_ptr& theEnd) : GeomAPI_Interface( newLine(theStart->x(), theStart->y(), theStart->z(), theEnd->x(), theEnd->y(), theEnd->z())) { } -double GeomAPI_Lin::distance(const boost::shared_ptr& thePoint) const +double GeomAPI_Lin::distance(const std::shared_ptr& thePoint) const { return MY_LIN->Distance(thePoint->impl()); } -const boost::shared_ptr GeomAPI_Lin::intersect( - const boost::shared_ptr& theLine) const +const std::shared_ptr GeomAPI_Lin::intersect( + const std::shared_ptr& theLine) const { if (MY_LIN->SquareDistance(theLine->impl()) > Precision::Confusion()) - return boost::shared_ptr(); + return std::shared_ptr(); const gp_Dir& aDir1 = MY_LIN->Direction(); const gp_Dir& aDir2 = theLine->impl().Direction(); @@ -61,16 +63,16 @@ const boost::shared_ptr GeomAPI_Lin::intersect( IntAna2d_AnaIntersection anInter(aPrjLine1, aPrjLine1); if (!anInter.IsDone() || anInter.IsEmpty()) - return boost::shared_ptr(); + return std::shared_ptr(); const gp_Pnt2d& anIntPnt2d = anInter.Point(0).Value(); gp_Pnt aResult = ElSLib::Value(anIntPnt2d.X(), anIntPnt2d.Y(), aPlane); - return boost::shared_ptr( + return std::shared_ptr( new GeomAPI_Pnt(aResult.X(), aResult.Y(), aResult.Z())); } -const boost::shared_ptr GeomAPI_Lin::project( - const boost::shared_ptr& thePoint) const +const std::shared_ptr GeomAPI_Lin::project( + const std::shared_ptr& thePoint) const { const gp_XYZ& aDir = MY_LIN->Direction().XYZ(); const gp_XYZ& aLoc = MY_LIN->Location().XYZ(); @@ -78,6 +80,6 @@ const boost::shared_ptr GeomAPI_Lin::project( double aParam = aDir.Dot(aPnt - aLoc); gp_XYZ aResult = aPnt + aDir * aParam; - return boost::shared_ptr(new GeomAPI_Pnt(aResult.X(), aResult.Y(), aResult.Z())); + return std::shared_ptr(new GeomAPI_Pnt(aResult.X(), aResult.Y(), aResult.Z())); }