X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point.h;h=2aa587a1d8f0819a5e8f5e9b4cf86c3752a3a41b;hb=b5893b0a30fac08134c24de4565cb513a43affa6;hp=8a0fb83aa438b26b071eb92f77d749b04722bf6e;hpb=b719c47b37c8dde30c075260dd1457d8f8a00f72;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point.h b/src/GeomData/GeomData_Point.h
index 8a0fb83aa..2aa587a1d 100644
--- a/src/GeomData/GeomData_Point.h
+++ b/src/GeomData/GeomData_Point.h
@@ -9,21 +9,20 @@
 
 #include "GeomData.h"
 #include "GeomDataAPI_Point.h"
-#include <TDataStd_RealArray.hxx>
-#include <TDataStd_ExtStringArray.hxx>
-#include <TDataStd_BooleanArray.hxx>
+
 #include <TDF_Label.hxx>
 
+class ModelAPI_ExpressionDouble;
+
 /**\class GeomData_Point
  * \ingroup DataModel
  * \brief Attribute that contains 3D point.
  */
-
 class GeomData_Point : public GeomDataAPI_Point
 {
-  Handle_TDataStd_RealArray myCoords;  ///< X, Y and Z doubles as real array attribute [0; 2]
-  Handle_TDataStd_ExtStringArray myTextArray;  ///< Text representation of the X, Y and Z attributes [0; 2]
-  Handle_TDataStd_BooleanArray myExpressionInvalidArray;  ///< Flag of invalid expression of the X, Y and Z attributes [0; 2]
+  enum { NUM_COMPONENTS = 3 };
+  /// Expressions for X, Y and Z
+  std::shared_ptr<ModelAPI_ExpressionDouble> myExpression[NUM_COMPONENTS];
  public:
   /// Defines the double value
   GEOMDATA_EXPORT virtual void setValue(const double theX, const double theY, const double theZ);
@@ -39,6 +38,10 @@ class GeomData_Point : public GeomDataAPI_Point
   /// Returns the 3D point
   GEOMDATA_EXPORT virtual std::shared_ptr<GeomAPI_Pnt> pnt();
 
+  /// Defines the calculated double value
+  GEOMDATA_EXPORT virtual
+    void setCalculatedValue(const double theX, const double theY, const double theZ);
+
   /// Defines the text values
   GEOMDATA_EXPORT virtual void setText(const std::string& theX,
                                        const std::string& theY,
@@ -52,14 +55,29 @@ class GeomData_Point : public GeomDataAPI_Point
   GEOMDATA_EXPORT virtual std::string textZ();
 
   /// Allows to set expression (text) as invalid (by the parameters listener)
-  GEOMDATA_EXPORT virtual void setExpressionInvalid(int, bool theFlag);
+  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_Point(TDF_Label& theLabel);
+  GEOMDATA_EXPORT GeomData_Point();
+  /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc)
+  virtual void reinit();
 
   friend class Model_Data;
 };