X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomDataAPI%2FGeomDataAPI_Point2D.h;h=633ef82559676141f9cf52c9d24ab22490fc8aa4;hb=fa96e988fcff7caf36ead00e027021fda402fdc3;hp=f5eb429382bffd9528137114adb9ed7b70938345;hpb=98be939e3a6c58498b6dd763301d3e5fa50bf397;p=modules%2Fshaper.git

diff --git a/src/GeomDataAPI/GeomDataAPI_Point2D.h b/src/GeomDataAPI/GeomDataAPI_Point2D.h
index f5eb42938..633ef8255 100644
--- a/src/GeomDataAPI/GeomDataAPI_Point2D.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point2D.h
@@ -1,12 +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>
+#include <ModelAPI_Data.h>
+
+#include <set>
 
 class GeomAPI_Pnt2d;
 
@@ -17,29 +22,80 @@ class GeomAPI_Pnt2d;
 
 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
-  virtual void setValue(const boost::shared_ptr<GeomAPI_Pnt2d>& thePoint) = 0;
+  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
-  virtual boost::shared_ptr<GeomAPI_Pnt2d> pnt() = 0;
+  GEOMDATAAPI_EXPORT virtual std::shared_ptr<GeomAPI_Pnt2d> pnt() = 0;
+
+  /// Defines the calculated double value
+  GEOMDATAAPI_EXPORT virtual void setCalculatedValue(const double theX, const double theY) = 0;
+
+  /// Defines the text values
+  GEOMDATAAPI_EXPORT virtual void setText(const std::string& theX,
+                                          const std::string& theY) = 0;
+
+  /// Returns the text value for X
+  GEOMDATAAPI_EXPORT virtual std::string textX() = 0;
+  /// Returns the text value for Y
+  GEOMDATAAPI_EXPORT virtual std::string textY() = 0;
+
+  /// Point component (x,y)
+  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;
+
+  /// Allows to set expression (text) error (by the parameters listener)
+  GEOMDATAAPI_EXPORT virtual void setExpressionError(int theComponent, const std::string& theError) = 0;
+
+  /// Returns an expression error
+  GEOMDATAAPI_EXPORT virtual std::string expressionError(int theComponent) = 0;
+
+  /// Defines the used parameters
+  GEOMDATAAPI_EXPORT virtual void setUsedParameters(int theComponent, 
+    const std::set<std::string>& theUsedParameters) = 0;
+
+  /// Returns the used parameters
+  GEOMDATAAPI_EXPORT virtual std::set<std::string> usedParameters(int theComponent) const = 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();
+
+  /// Returns this attribute from the data if it is possible
+  /// \param theData a model data
+  /// \param theAttribute an attribute index
+  static GEOMDATAAPI_EXPORT std::shared_ptr<GeomDataAPI_Point2D> getPoint2D(const DataPtr& theData,
+                                                                  const std::string& theAttribute);
 
-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