X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point2D.h;h=3bb62e8a02cd1b7a1d47d38cd2978e99d8be41d7;hb=ee67e86b7fd96c6e640b07c46dbd586065ef12ae;hp=f5989898e78c5da66e1f77356df0485925f7def2;hpb=4783f146b71a48c651523fcf0e12367bcf3d1fa8;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point2D.h b/src/GeomData/GeomData_Point2D.h
index f5989898e..3bb62e8a0 100644
--- a/src/GeomData/GeomData_Point2D.h
+++ b/src/GeomData/GeomData_Point2D.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomData_Point2D.h
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -7,9 +9,11 @@
 
 #include "GeomData.h"
 #include "GeomDataAPI_Point2D.h"
-#include <TDataStd_RealArray.hxx>
+
 #include <TDF_Label.hxx>
 
+class ModelAPI_ExpressionDouble;
+
 /**\class GeomData_Point2D
  * \ingroup DataModel
  * \brief Attribute that contains 2D point.
@@ -17,7 +21,8 @@
 
 class GeomData_Point2D : public GeomDataAPI_Point2D
 {
-  Handle_TDataStd_RealArray myCoords;  ///< X and Y doubles as real array attribute [0; 1]
+  enum { NUM_COMPONENTS = 2 };
+  std::shared_ptr<ModelAPI_ExpressionDouble> myExpression[NUM_COMPONENTS]; ///< Expressions for X, Y
  public:
   /// Defines the double value
   GEOMDATA_EXPORT virtual void setValue(const double theX, const double theY);
@@ -31,9 +36,44 @@ class GeomData_Point2D : public GeomDataAPI_Point2D
   /// Returns the 2D point
   GEOMDATA_EXPORT virtual std::shared_ptr<GeomAPI_Pnt2d> pnt();
 
+  /// Defines the calculated double value
+  GEOMDATA_EXPORT virtual void setCalculatedValue(const double theX, const double theY);
+
+  /// Defines the text values
+  GEOMDATA_EXPORT virtual void setText(const std::string& theX,
+                                       const std::string& theY);
+
+  /// Returns the text values
+  GEOMDATA_EXPORT virtual std::string textX();
+  GEOMDATA_EXPORT virtual std::string textY();
+
+  /// Allows to set expression (text) as invalid (by the parameters listener)
+  GEOMDATA_EXPORT virtual void setExpressionInvalid(int, const bool theFlag);
+
+  /// Returns true if text is invalid
+  GEOMDATA_EXPORT virtual bool expressionInvalid(int);
+
+  /// Allows to set expression (text) error (by the parameters listener)
+  GEOMDATA_EXPORT virtual void setExpressionError(int theComponent, const std::string& theError);
+
+  /// Returns an expression error
+  GEOMDATA_EXPORT virtual std::string expressionError(int theComponent);
+
+  /// Defines the used parameters
+  GEOMDATA_EXPORT virtual void setUsedParameters(int theComponent,
+    const std::set<std::string>& theUsedParameters);
+
+  /// Returns the used parameters
+  GEOMDATA_EXPORT virtual std::set<std::string> usedParameters(int theComponent) const;
+
  protected:
   /// Initializes attributes
-  GEOMDATA_EXPORT GeomData_Point2D(TDF_Label& theLabel);
+  GEOMDATA_EXPORT GeomData_Point2D();
+  /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc)
+  virtual void reinit();
+
+  /// Resets attribute to deafult state.
+  virtual void reset();
 
   friend class Model_Data;
 };