X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Pnt2d.h;h=ede3968e71ed632957388a63f53a10c701dbb285;hb=fdd802da7683f66ca609cf12b1e11be9642149d6;hp=097e8786ea144dc232309a3eae42fa769e2f18d6;hpb=773b6bcbbd4a811340e699667014b13185f80dbc;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Pnt2d.h b/src/GeomAPI/GeomAPI_Pnt2d.h
index 097e8786e..ede3968e7 100644
--- a/src/GeomAPI/GeomAPI_Pnt2d.h
+++ b/src/GeomAPI/GeomAPI_Pnt2d.h
@@ -1,39 +1,82 @@
-// File:        GeomAPI_Pnt2d.h
-// Created:     29 May 2014
-// Author:      Artem ZHIDKOV
+// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
-#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_XYZ;
+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_Pnt2d : public GeomAPI_Interface
 {
-public:
+ public:
   /// Creation of point by coordinates
+  GEOMAPI_EXPORT
   GeomAPI_Pnt2d(const double theX, const double theY);
+  /// Creation of point by coordinates
+  GEOMAPI_EXPORT
+  GeomAPI_Pnt2d(const std::shared_ptr<GeomAPI_XY>& theCoords);
 
   /// returns X coordinate
+  GEOMAPI_EXPORT
   double x() const;
   /// returns Y coordinate
+  GEOMAPI_EXPORT
   double y() const;
 
   /// sets X coordinate
+  GEOMAPI_EXPORT
   void setX(const double theX);
   /// sets Y coordinate
+  GEOMAPI_EXPORT
   void setY(const double theY);
 
+  /// Returns the 3D point
+  GEOMAPI_EXPORT
+  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
+  GEOMAPI_EXPORT
+  const std::shared_ptr<GeomAPI_XY> xy();
+
   /// Distance between two points
-  double distance(const boost::shared_ptr<GeomAPI_Pnt2d>& theOther) const;
+  GEOMAPI_EXPORT
+  double distance(const std::shared_ptr<GeomAPI_Pnt2d>& theOther) const;
+
+  /// Returns whether the distance between two points is less then precision confusion
+  GEOMAPI_EXPORT
+  bool isEqual(const std::shared_ptr<GeomAPI_Pnt2d>& theOther) const;
 };
 
+//! Pointer on the object
+typedef std::shared_ptr<GeomAPI_Pnt2d> GeomPnt2dPtr;
+
 #endif