X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Lin.cpp;h=27bd3e0e297fdee97d63db8ed18e4d9ed2661d41;hb=0448acdd8e8c1e1638a2cf861e42e915966b2034;hp=9d040702438eb7018cd74c4e77938f55fe3c11a9;hpb=81dad1acf409fa5e71090501bc1aa7e0b7d80cde;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Lin.cpp b/src/GeomAPI/GeomAPI_Lin.cpp
index 9d0407024..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
@@ -20,55 +22,57 @@
 #define MY_LIN static_cast<gp_Lin*>(myImpl)
 
 static gp_Lin* newLine(const double theStartX, const double theStartY, const double theStartZ,
-                       const double theEndX,   const double theEndY,   const double theEndZ)
+                       const double theEndX, const double theEndY, const double theEndZ)
 {
   gp_XYZ aDir(theEndX - theStartX, theEndY - theStartY, theEndZ - theStartZ);
   gp_Pnt aStart(theStartX, theStartY, theStartZ);
   return new gp_Lin(aStart, gp_Dir(aDir));
 }
 
-
 GeomAPI_Lin::GeomAPI_Lin(const double theStartX, const double theStartY, const double theStartZ,
-                         const double theEndX,   const double theEndY,   const double theEndZ)
-  : GeomAPI_Interface(newLine(theStartX, theStartY, theStartZ, theEndX, theEndY, theEndZ))
-{}
+                         const double theEndX, const double theEndY, const double theEndZ)
+    : GeomAPI_Interface(newLine(theStartX, theStartY, theStartZ, theEndX, theEndY, theEndZ))
+{
+}
 
-GeomAPI_Lin::GeomAPI_Lin(const boost::shared_ptr<GeomAPI_Pnt>& theStart,
-                         const boost::shared_ptr<GeomAPI_Pnt>& theEnd)
-  : GeomAPI_Interface(newLine(theStart->x(), theStart->y(), theStart->z(), 
-                              theEnd->x(),   theEnd->y(),   theEnd->z()))
-{}
+GeomAPI_Lin::GeomAPI_Lin(const std::shared_ptr<GeomAPI_Pnt>& theStart,
+                         const std::shared_ptr<GeomAPI_Pnt>& theEnd)
+    : GeomAPI_Interface(
+        newLine(theStart->x(), theStart->y(), theStart->z(), theEnd->x(), theEnd->y(), theEnd->z()))
+{
+}
 
-double GeomAPI_Lin::distance(const boost::shared_ptr<GeomAPI_Pnt>& thePoint) const
+double GeomAPI_Lin::distance(const std::shared_ptr<GeomAPI_Pnt>& thePoint) const
 {
   return MY_LIN->Distance(thePoint->impl<gp_Pnt>());
 }
 
-const boost::shared_ptr<GeomAPI_Pnt> GeomAPI_Lin::intersect(
-                const boost::shared_ptr<GeomAPI_Lin>& theLine) const
+const std::shared_ptr<GeomAPI_Pnt> GeomAPI_Lin::intersect(
+    const std::shared_ptr<GeomAPI_Lin>& theLine) const
 {
   if (MY_LIN->SquareDistance(theLine->impl<gp_Lin>()) > Precision::Confusion())
-    return boost::shared_ptr<GeomAPI_Pnt>();
+  return std::shared_ptr<GeomAPI_Pnt>();
 
   const gp_Dir& aDir1 = MY_LIN->Direction();
   const gp_Dir& aDir2 = theLine->impl<gp_Lin>().Direction();
   gp_Dir aCross = aDir1.Crossed(aDir2);
-  gp_Pln aPlane(MY_LIN->Location(), aCross); // plane containing both lines
+  gp_Pln aPlane(MY_LIN->Location(), aCross);  // plane containing both lines
 
   gp_Lin2d aPrjLine1 = ProjLib::Project(aPlane, *MY_LIN);
   gp_Lin2d aPrjLine2 = ProjLib::Project(aPlane, theLine->impl<gp_Lin>());
 
   IntAna2d_AnaIntersection anInter(aPrjLine1, aPrjLine1);
   if (!anInter.IsDone() || anInter.IsEmpty())
-    return boost::shared_ptr<GeomAPI_Pnt>();
+  return std::shared_ptr<GeomAPI_Pnt>();
   const gp_Pnt2d& anIntPnt2d = anInter.Point(0).Value();
   gp_Pnt aResult = ElSLib::Value(anIntPnt2d.X(), anIntPnt2d.Y(), aPlane);
 
-  return boost::shared_ptr<GeomAPI_Pnt>(
-    new GeomAPI_Pnt(aResult.X(), aResult.Y(), aResult.Z()));
+  return std::shared_ptr<GeomAPI_Pnt>(
+  new GeomAPI_Pnt(aResult.X(), aResult.Y(), aResult.Z()));
 }
 
-const boost::shared_ptr<GeomAPI_Pnt> GeomAPI_Lin::project(const boost::shared_ptr<GeomAPI_Pnt>& thePoint) const
+const std::shared_ptr<GeomAPI_Pnt> GeomAPI_Lin::project(
+    const std::shared_ptr<GeomAPI_Pnt>& thePoint) const
 {
   const gp_XYZ& aDir = MY_LIN->Direction().XYZ();
   const gp_XYZ& aLoc = MY_LIN->Location().XYZ();
@@ -76,6 +80,6 @@ const boost::shared_ptr<GeomAPI_Pnt> GeomAPI_Lin::project(const boost::shared_pt
   double aParam = aDir.Dot(aPnt - aLoc);
 
   gp_XYZ aResult = aPnt + aDir * aParam;
-  return boost::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(aResult.X(), aResult.Y(), aResult.Z()));
+  return std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(aResult.X(), aResult.Y(), aResult.Z()));
 }