X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Lin.h;h=f2eaebfb267f3d90cd85f31f89f619bd6c112053;hb=29bc47d2f0f38f132e4f578feec9a1d1c8e514fe;hp=69d1ba48a1c2a432fbb5395cbd968de87452276f;hpb=8dc74f82810d5f597b78633b457efb0ef4f89f9f;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Lin.h b/src/GeomAPI/GeomAPI_Lin.h
index 69d1ba48a..f2eaebfb2 100644
--- a/src/GeomAPI/GeomAPI_Lin.h
+++ b/src/GeomAPI/GeomAPI_Lin.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Lin.h
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
@@ -6,8 +8,9 @@
 #define GeomAPI_Lin_H_
 
 #include <GeomAPI_Interface.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
+class GeomAPI_Dir;
 class GeomAPI_Pnt;
 
 /**\class GeomAPI_Lin
@@ -15,24 +18,56 @@ class GeomAPI_Pnt;
  * \brief Line in 3D
  */
 
-class GEOMAPI_EXPORT GeomAPI_Lin : public GeomAPI_Interface
+class GeomAPI_Lin : public GeomAPI_Interface
 {
  public:
   /// Creation of line defined by cordinates of start and end points
+  GEOMAPI_EXPORT
   GeomAPI_Lin(const double theStartX, const double theStartY, const double theStartZ,
               const double theEndX, const double theEndY, const double theEndZ);
   /// Creation of line defined by start and end points
-  GeomAPI_Lin(const boost::shared_ptr<GeomAPI_Pnt>& theStart,
-              const boost::shared_ptr<GeomAPI_Pnt>& theEnd);
+  GEOMAPI_EXPORT
+  GeomAPI_Lin(const std::shared_ptr<GeomAPI_Pnt>& theStart,
+              const std::shared_ptr<GeomAPI_Pnt>& theEnd);
+  /// Creation of line defined by origin and direction
+  GEOMAPI_EXPORT
+  GeomAPI_Lin(const std::shared_ptr<GeomAPI_Pnt>& theOrigin,
+              const std::shared_ptr<GeomAPI_Dir>& theDirection);
+
+  /// Returns point on the line (first point)
+  GEOMAPI_EXPORT
+  std::shared_ptr<GeomAPI_Pnt> location();
+
+  /// Returns a line direction
+  GEOMAPI_EXPORT
+  std::shared_ptr<GeomAPI_Dir> direction();
 
   /// Distance between two points
-  double distance(const boost::shared_ptr<GeomAPI_Pnt>& thePoint) const;
+  GEOMAPI_EXPORT
+  double distance(const std::shared_ptr<GeomAPI_Pnt>& thePoint) const;
   /// Intersection of two lines
-  const boost::shared_ptr<GeomAPI_Pnt> intersect(
-      const boost::shared_ptr<GeomAPI_Lin>& theLine) const;
+  GEOMAPI_EXPORT
+  const std::shared_ptr<GeomAPI_Pnt> intersect(
+      const std::shared_ptr<GeomAPI_Lin>& theLine) const;
   /// Project point on line
-  const boost::shared_ptr<GeomAPI_Pnt> project(
-      const boost::shared_ptr<GeomAPI_Pnt>& thePoint) const;
+  GEOMAPI_EXPORT
+  const std::shared_ptr<GeomAPI_Pnt> project(
+      const std::shared_ptr<GeomAPI_Pnt>& thePoint) const;
+
+  /// \return true if this line contains thePoint, that is,
+  /// if the distance between thePoint and this line
+  ///         is less than or equal to theLinearTolerance.
+  GEOMAPI_EXPORT
+  bool contains(const std::shared_ptr<GeomAPI_Pnt> thePoint,
+                const double theLinearTolerance = 1.e-7) const;
+
+  /// \return true if lines are parallel.
+  GEOMAPI_EXPORT
+  bool isParallel(const std::shared_ptr<GeomAPI_Lin> theLin) const;
+
+  /// \return true if lines are coplanar.
+  GEOMAPI_EXPORT
+  bool isCoplanar(const std::shared_ptr<GeomAPI_Lin> theLin) const;
 };
 
 #endif