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

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

diff --git a/src/GeomAPI/GeomAPI_Pnt2d.h b/src/GeomAPI/GeomAPI_Pnt2d.h
index a1faf626c561b1e5df015cb502575af70cbab1c4..bd0000fdb867d2e0bc919862bf41f599db18cf8b 100644 (file)
--- a/src/GeomAPI/GeomAPI_Pnt2d.h
+++ b/src/GeomAPI/GeomAPI_Pnt2d.h
@@ -1,27 +1,31 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Pnt2d.h
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Pnt2d_HeaderFile
-#define GeomAPI_Pnt2d_HeaderFile
+#ifndef GeomAPI_Pnt2d_H_
+#define GeomAPI_Pnt2d_H_
 
 #include <GeomAPI_Interface.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class GeomAPI_XY;
+class GeomAPI_Pnt;
+class GeomAPI_Dir;
 
 /**\class GeomAPI_Pnt2d
  * \ingroup DataModel
  * \brief 2D point defined by two coordinates
  */
 
-class GEOMAPI_EXPORT GeomAPI_Pnt2d: public GeomAPI_Interface
+class GEOMAPI_EXPORT GeomAPI_Pnt2d : public GeomAPI_Interface
 {
-public:
+ public:
   /// Creation of point by coordinates
   GeomAPI_Pnt2d(const double theX, const double theY);
   /// Creation of point by coordinates
-  GeomAPI_Pnt2d(const boost::shared_ptr<GeomAPI_XY>& theCoords);
+  GeomAPI_Pnt2d(const std::shared_ptr<GeomAPI_XY>& theCoords);
 
   /// returns X coordinate
   double x() const;
@@ -33,11 +37,19 @@ public:
   /// sets Y coordinate
   void setY(const double theY);
 
+  /// Returns the 3D point
+  std::shared_ptr<GeomAPI_Pnt> to3D(const std::shared_ptr<GeomAPI_Pnt>& theOrigin,
+                                      const std::shared_ptr<GeomAPI_Dir>& theDirX,
+                                      const std::shared_ptr<GeomAPI_Dir>& theDirY);
+
   /// returns coordinates of the point
-  const boost::shared_ptr<GeomAPI_XY> xy();
+  const std::shared_ptr<GeomAPI_XY> xy();
 
   /// Distance between two points
-  double distance(const boost::shared_ptr<GeomAPI_Pnt2d>& theOther) const;
+  double distance(const std::shared_ptr<GeomAPI_Pnt2d>& theOther) const;
+
+  /// Returns whether the distance between two points is less then precision confusion
+  bool isEqual(const std::shared_ptr<GeomAPI_Pnt2d>& theOther) const;
 };
 
 #endif