Merge branch 'Dev_2.1.0' of salome:modules/shaper into Dev_2.1.0

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

diff --git a/src/GeomDataAPI/GeomDataAPI_Point2D.h b/src/GeomDataAPI/GeomDataAPI_Point2D.h
index 3da9d2f009391dfcef1f12d90b50968836c77348..633ef82559676141f9cf52c9d24ab22490fc8aa4 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI_Point2D.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point2D.h
@@ -9,6 +9,9 @@
 
 #include <GeomDataAPI.h>
 #include <ModelAPI_Attribute.h>
+#include <ModelAPI_Data.h>
+
+#include <set>
 
 class GeomAPI_Pnt2d;
 
@@ -39,10 +42,12 @@ class GeomDataAPI_Point2D : public ModelAPI_Attribute
   GEOMDATAAPI_EXPORT virtual void setText(const std::string& theX,
                                           const std::string& theY) = 0;
 
-  /// Returns the text values
+  /// 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,
   };
@@ -53,6 +58,19 @@ class GeomDataAPI_Point2D : public ModelAPI_Attribute
   /// 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);
 
@@ -65,6 +83,12 @@ class GeomDataAPI_Point2D : public ModelAPI_Attribute
   /// Returns the type of this class of attributes, not static method
   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:
   /// Objects are created for features automatically
   GEOMDATAAPI_EXPORT GeomDataAPI_Point2D();