X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomDataAPI%2FGeomDataAPI_Point2D.h;h=c693456a99f66b4636d43ff7665d9fcd758a7da4;hb=b6f308f901ef00da365c40bab25c5f03b547adf0;hp=bfc8094c2c121a7ca803ab869edc0b04373448b0;hpb=1a6a9c1c0c466abb867f2c2815b20aa0620a444c;p=modules%2Fshaper.git

diff --git a/src/GeomDataAPI/GeomDataAPI_Point2D.h b/src/GeomDataAPI/GeomDataAPI_Point2D.h
index bfc8094c2..c693456a9 100644
--- 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 <GeomDataAPI.h>
 #include <ModelAPI_Attribute.h>
 
+class GeomAPI_Pnt2d;
+
 /**\class GeomDataAPI_Point2D
  * \ingroup DataModel
  * \brief Attribute that contains 2D point coordinates.
@@ -15,25 +19,56 @@
 
 class GeomDataAPI_Point2D : public ModelAPI_Attribute
 {
-public:
+ public:
   /// Defines the double value
-  virtual void setValue(const double theX, const double theY) = 0;
+  GEOMDATAAPI_EXPORT virtual void setValue(const double theX, const double theY) = 0;
+  /// Defines the point
+  GEOMDATAAPI_EXPORT virtual void setValue(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint) = 0;
 
   /// Returns the X double value
-  virtual double x() const = 0;
+  GEOMDATAAPI_EXPORT virtual double x() const = 0;
   /// Returns the Y double value
-  virtual double y() const = 0;
+  GEOMDATAAPI_EXPORT virtual double y() const = 0;
+  /// Returns the 2D point
+  GEOMDATAAPI_EXPORT virtual std::shared_ptr<GeomAPI_Pnt2d> pnt() = 0;
+
+  /// Defines the double values
+  GEOMDATAAPI_EXPORT virtual void setText(const std::string& theX,
+                                          const std::string& theY) = 0;
+
+  /// Returns the double values
+  GEOMDATAAPI_EXPORT virtual std::string textX() = 0;
+  GEOMDATAAPI_EXPORT virtual std::string textY() = 0;
+
+  enum PointComponent { C_X = 0,
+                        C_Y = 1,
+  };
+
+  /// Allows to set expression (text) as invalid (by the parameters listener)
+  GEOMDATAAPI_EXPORT virtual void setExpressionInvalid(int theComponent, const bool theFlag) = 0;
+
+  /// Returns true if text is invalid
+  GEOMDATAAPI_EXPORT virtual bool expressionInvalid(int theComponent) = 0;
+
+  /// Appends the delta values to point
+  GEOMDATAAPI_EXPORT void move(const double theDeltaX, const double theDeltaY);
 
   /// Returns the type of this class of attributes
-  static inline std::string type() {return std::string("Point2D");}
+  static std::string typeId()
+  {
+    return std::string("Point2D");
+  }
 
   /// Returns the type of this class of attributes, not static method
-  virtual std::string attributeType() {return type();}
+  GEOMDATAAPI_EXPORT virtual std::string attributeType();
 
-protected:
+ protected:
   /// Objects are created for features automatically
-  GeomDataAPI_Point2D()
-  {}
+  GEOMDATAAPI_EXPORT GeomDataAPI_Point2D();
+  GEOMDATAAPI_EXPORT virtual ~GeomDataAPI_Point2D();
 };
 
+//! Pointer on attribute object
+typedef std::shared_ptr<GeomDataAPI_Point2D> AttributePoint2DPtr;
+
 #endif