Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

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

diff --git a/src/GeomAPI/GeomAPI_Pnt.h b/src/GeomAPI/GeomAPI_Pnt.h
index a63974d98c597c088c4e98037a3a0d1d19e57989..44f203a7735232d5b8691da10a3b3f2b3b62f44e 100644 (file)
--- a/src/GeomAPI/GeomAPI_Pnt.h
+++ b/src/GeomAPI/GeomAPI_Pnt.h
@@ -1,27 +1,32 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Pnt.hxx
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Pnt_HeaderFile
-#define GeomAPI_Pnt_HeaderFile
+#ifndef GeomAPI_Pnt_H_
+#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
  * \brief 3D point defined by three coordinates
  */
 
-class GEOMAPI_EXPORT GeomAPI_Pnt: public GeomAPI_Interface
+class GEOMAPI_EXPORT GeomAPI_Pnt : public GeomAPI_Interface
 {
-public:
+ public:
   /// 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;
@@ -38,8 +43,21 @@ public:
   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 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
+  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
-