Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

[modules/shaper.git] / src / GeomData / GeomData_Point.h

diff --git a/src/GeomData/GeomData_Point.h b/src/GeomData/GeomData_Point.h
index 06f84959ac05f1f3fe87192b9a6e93945b9837c0..d4b715ac43a86418b9f94b746b1a1efe52ff8d61 100644 (file)
--- a/src/GeomData/GeomData_Point.h
+++ b/src/GeomData/GeomData_Point.h
@@ -1,9 +1,11 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomData_Point.h
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomData_Point_HeaderFile
-#define GeomData_Point_HeaderFile
+#ifndef GeomData_Point_H_
+#define GeomData_Point_H_
 
 #include "GeomData.h"
 #include "GeomDataAPI_Point.h"
@@ -12,26 +14,32 @@
 
 /**\class GeomData_Point
  * \ingroup DataModel
- * \brief Attribute that contains real value with double precision.
+ * \brief Attribute that contains 3D point.
  */
 
-class GeomData_Point : public ModelAPI_Attribute
+class GeomData_Point : public GeomDataAPI_Point
 {
-  Handle_TDataStd_RealArray myCoords; ///< X, Y and Z doubles as real array attribute [0; 2]
-public:
+  Handle_TDataStd_RealArray myCoords;  ///< X, Y and Z doubles as real array attribute [0; 2]
+ public:
   /// Defines the double value
-  virtual void setValue(const double theX, const double theY, const double theZ);
+  GEOMDATA_EXPORT virtual void setValue(const double theX, const double theY, const double theZ);
+  /// Defines the point
+  GEOMDATA_EXPORT virtual void setValue(const std::shared_ptr<GeomAPI_Pnt>& thePoint);
 
   /// Returns the X double value
-  virtual double x() const;
+  GEOMDATA_EXPORT virtual double x() const;
   /// Returns the Y double value
-  virtual double y() const;
+  GEOMDATA_EXPORT virtual double y() const;
   /// Returns the Z double value
-  virtual double z() const;
+  GEOMDATA_EXPORT virtual double z() const;
+  /// Returns the 3D point
+  GEOMDATA_EXPORT virtual std::shared_ptr<GeomAPI_Pnt> pnt();
 
-protected:
+ protected:
   /// Initializes attributes
-  GeomData_Point(TDF_Label& theLabel);
+  GEOMDATA_EXPORT GeomData_Point(TDF_Label& theLabel);
+
+  friend class Model_Data;
 };
 
 #endif