Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0

[modules/shaper.git] / src / GeomAPI / GeomAPI_Pnt.h

diff --git a/src/GeomAPI/GeomAPI_Pnt.h b/src/GeomAPI/GeomAPI_Pnt.h
index af4cce8493b180a4b189f733a3025b1b5c5f188c..44f203a7735232d5b8691da10a3b3f2b3b62f44e 100644 (file)
--- a/src/GeomAPI/GeomAPI_Pnt.h
+++ b/src/GeomAPI/GeomAPI_Pnt.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Pnt.hxx
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -6,11 +8,12 @@
 #define GeomAPI_Pnt_H_
 
 #include <GeomAPI_Interface.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class GeomAPI_XYZ;
 class GeomAPI_Pnt2d;
 class GeomAPI_Dir;
+class GeomAPI_Pln;
 
 /**\class GeomAPI_Pnt
  * \ingroup DataModel
@@ -23,7 +26,7 @@ class GEOMAPI_EXPORT GeomAPI_Pnt : public GeomAPI_Interface
   /// Creation of point by coordinates
   GeomAPI_Pnt(const double theX, const double theY, const double theZ);
   /// Creation of point by coordinates
-  GeomAPI_Pnt(const boost::shared_ptr<GeomAPI_XYZ>& theCoords);
+  GeomAPI_Pnt(const std::shared_ptr<GeomAPI_XYZ>& theCoords);
 
   /// returns X coordinate
   double x() const;
@@ -40,15 +43,21 @@ class GEOMAPI_EXPORT GeomAPI_Pnt : public GeomAPI_Interface
   void setZ(const double theZ);
 
   /// returns coordinates of the point
-  const boost::shared_ptr<GeomAPI_XYZ> xyz();
+  const std::shared_ptr<GeomAPI_XYZ> xyz();
 
   /// Distance between two points
-  double distance(const boost::shared_ptr<GeomAPI_Pnt>& theOther) const;
+  double distance(const std::shared_ptr<GeomAPI_Pnt>& theOther) const;
+
+  /// Projects a point to the plane defined by the origin and 2 axes vectors in this plane
+  std::shared_ptr<GeomAPI_Pnt2d> to2D(const std::shared_ptr<GeomAPI_Pnt>& theOrigin,
+                                        const std::shared_ptr<GeomAPI_Dir>& theDirX,
+                                        const std::shared_ptr<GeomAPI_Dir>& theDirY);
 
   /// Projects a point to the plane defined by the origin and 2 axes vectors in this plane
-  boost::shared_ptr<GeomAPI_Pnt2d> to2D(const boost::shared_ptr<GeomAPI_Pnt>& theOrigin,
-                                        const boost::shared_ptr<GeomAPI_Dir>& theDirX,
-                                        const boost::shared_ptr<GeomAPI_Dir>& theDirY);
+  std::shared_ptr<GeomAPI_Pnt2d> to2D(const std::shared_ptr<GeomAPI_Pln>& thePln) const;
+
+  /// Translates the point along direction theDir on distance theDist
+  void translate(const std::shared_ptr<GeomAPI_Dir>& theDir, double theDist);
 };
 
 #endif