X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Lin.h;h=6f67109848906352f76a302c25ed893476b80653;hb=73502ac782ffc45a3acf665ded34f582b07ec4d5;hp=260b5ffeec63e8105d266c3dd08797bb5e95780b;hpb=773b6bcbbd4a811340e699667014b13185f80dbc;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Lin.h b/src/GeomAPI/GeomAPI_Lin.h
index 260b5ffee..6f6710984 100644
--- a/src/GeomAPI/GeomAPI_Lin.h
+++ b/src/GeomAPI/GeomAPI_Lin.h
@@ -1,13 +1,16 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Lin.h
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Lin_HeaderFile
-#define GeomAPI_Lin_HeaderFile
+#ifndef GeomAPI_Lin_H_
+#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,22 +18,41 @@ class GeomAPI_Pnt;
  * \brief Line in 3D
  */
 
-class GEOMAPI_EXPORT GeomAPI_Lin: public GeomAPI_Interface
+class GeomAPI_Lin : public GeomAPI_Interface
 {
-public:
+ 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);
+              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;
 };
 
 #endif