Merge branch 'master' of newgeom:newgeom

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

diff --git a/src/GeomAPI/GeomAPI_Pnt.h b/src/GeomAPI/GeomAPI_Pnt.h
index 8f80bef18628e78d60994c2bc8b313ed7b77f061..6e4e527d554ce6795f36f8113899b184e0b3ebc5 100644 (file)
--- a/src/GeomAPI/GeomAPI_Pnt.h
+++ b/src/GeomAPI/GeomAPI_Pnt.h
@@ -2,21 +2,26 @@
 // 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>
+
+class GeomAPI_XYZ;
 
 /**\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);
 
   /// returns X coordinate
   double x() const;
@@ -31,6 +36,12 @@ public:
   void setY(const double theY);
   /// sets Z coordinate
   void setZ(const double theZ);
+
+  /// returns coordinates of the point
+  const boost::shared_ptr<GeomAPI_XYZ> xyz();
+
+  /// Distance between two points
+  double distance(const boost::shared_ptr<GeomAPI_Pnt>& theOther) const;
 };
 
 #endif