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

[modules/shaper.git] / src / GeomDataAPI / GeomDataAPI_Point2D.h

diff --git a/src/GeomDataAPI/GeomDataAPI_Point2D.h b/src/GeomDataAPI/GeomDataAPI_Point2D.h
index bfc8094c2c121a7ca803ab869edc0b04373448b0..83acc0b57e05bb510735a3dd5991ce272d07b2bc 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI_Point2D.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point2D.h
@@ -1,13 +1,17 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomDataAPI_Point2D.h
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomDataAPI_Point2D_HeaderFile
-#define GeomDataAPI_Point2D_HeaderFile
+#ifndef GeomDataAPI_Point2D_H_
+#define GeomDataAPI_Point2D_H_
 
 #include "GeomDataAPI.h"
 #include <ModelAPI_Attribute.h>
 
+class GeomAPI_Pnt2d;
+
 /**\class GeomDataAPI_Point2D
  * \ingroup DataModel
  * \brief Attribute that contains 2D point coordinates.
@@ -15,25 +19,43 @@
 
 class GeomDataAPI_Point2D : public ModelAPI_Attribute
 {
-public:
+ public:
   /// Defines the double value
   virtual void setValue(const double theX, const double theY) = 0;
+  /// Defines the point
+  virtual void setValue(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint) = 0;
 
   /// Returns the X double value
   virtual double x() const = 0;
   /// Returns the Y double value
   virtual double y() const = 0;
+  /// Returns the 2D point
+  virtual std::shared_ptr<GeomAPI_Pnt2d> pnt() = 0;
+
+  /// Appends the delta values to point
+  void move(const double theDeltaX, const double theDeltaY)
+  {
+    setValue(x() + theDeltaX, y() + theDeltaY);
+  }
+
 
   /// Returns the type of this class of attributes
-  static inline std::string type() {return std::string("Point2D");}
+  static inline std::string type()
+  {
+    return std::string("Point2D");
+  }
 
   /// Returns the type of this class of attributes, not static method
-  virtual std::string attributeType() {return type();}
+  virtual std::string attributeType()
+  {
+    return type();
+  }
 
-protected:
+ protected:
   /// Objects are created for features automatically
   GeomDataAPI_Point2D()
-  {}
+  {
+  }
 };
 
 #endif