X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomDataAPI%2FGeomDataAPI_Point2D.h;h=7f67085e7dadd92981d7b5b9630a67f458101c35;hb=fa23c35c1070057c83ffe5106c8e2bc229eea7e1;hp=459185ce7a452269d561b39bb9f64865a44916ff;hpb=b719c47b37c8dde30c075260dd1457d8f8a00f72;p=modules%2Fshaper.git

diff --git a/src/GeomDataAPI/GeomDataAPI_Point2D.h b/src/GeomDataAPI/GeomDataAPI_Point2D.h
index 459185ce7..7f67085e7 100644
--- a/src/GeomDataAPI/GeomDataAPI_Point2D.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point2D.h
@@ -10,6 +10,8 @@
 #include <GeomDataAPI.h>
 #include <ModelAPI_Attribute.h>
 
+#include <set>
+
 class GeomAPI_Pnt2d;
 
 /**\class GeomDataAPI_Point2D
@@ -21,34 +23,52 @@ class GeomDataAPI_Point2D : public ModelAPI_Attribute
 {
  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 std::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 std::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 double values
-  virtual void setText(const std::string& theX,
-                       const std::string& theY) = 0;
+  /// Defines the text values
+  GEOMDATAAPI_EXPORT virtual void setText(const std::string& theX,
+                                          const std::string& theY) = 0;
 
-  /// Returns the double values
-  virtual std::string textX() = 0;
-  virtual std::string textY() = 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)
-  virtual void setExpressionInvalid(int theComponent, const bool theFlag) = 0;
+  GEOMDATAAPI_EXPORT virtual void setExpressionInvalid(int theComponent, const bool theFlag) = 0;
 
   /// Returns true if text is invalid
-  virtual bool expressionInvalid(int theComponent) = 0;
+  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);
@@ -68,4 +88,7 @@ class GeomDataAPI_Point2D : public ModelAPI_Attribute
   GEOMDATAAPI_EXPORT virtual ~GeomDataAPI_Point2D();
 };
 
+//! Pointer on attribute object
+typedef std::shared_ptr<GeomDataAPI_Point2D> AttributePoint2DPtr;
+
 #endif