X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point.h;h=71c663e90e26a84b59171a346ae08531c261e359;hb=0c64a21a042cfdd26920de8b2fbb11604547d4d0;hp=116039cf196daad35fe7e6e5aa6cfe3130bc79a5;hpb=73c02c2103a34ec5d2ac48a345757dee0e0d42f9;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point.h b/src/GeomData/GeomData_Point.h
index 116039cf1..71c663e90 100644
--- a/src/GeomData/GeomData_Point.h
+++ b/src/GeomData/GeomData_Point.h
@@ -1,28 +1,32 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomData_Point.h
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomData_Point_HeaderFile
-#define GeomData_Point_HeaderFile
+#ifndef GeomData_Point_H_
+#define GeomData_Point_H_
 
 #include "GeomData.h"
 #include "GeomDataAPI_Point.h"
-#include <TDataStd_RealArray.hxx>
+
 #include <TDF_Label.hxx>
 
+class ModelAPI_Expression;
+
 /**\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]
-public:
+  enum { NUM_COMPONENTS = 3 };
+  std::shared_ptr<ModelAPI_Expression> myExpression[NUM_COMPONENTS]; ///< Expressions for X, Y and Z 
+ public:
   /// Defines the double value
   GEOMDATA_EXPORT virtual void setValue(const double theX, const double theY, const double theZ);
   /// Defines the point
-  GEOMDATA_EXPORT virtual void setValue(const boost::shared_ptr<GeomAPI_Pnt>& thePoint);
+  GEOMDATA_EXPORT virtual void setValue(const std::shared_ptr<GeomAPI_Pnt>& thePoint);
 
   /// Returns the X double value
   GEOMDATA_EXPORT virtual double x() const;
@@ -31,9 +35,43 @@ public:
   /// Returns the Z double value
   GEOMDATA_EXPORT virtual double z() const;
   /// Returns the 3D point
-  GEOMDATA_EXPORT virtual boost::shared_ptr<GeomAPI_Pnt> pnt();
+  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,
+                                       const std::string& theZ);
+
+  /// Returns the X text value
+  GEOMDATA_EXPORT virtual std::string textX();
+  /// Returns the Y text value
+  GEOMDATA_EXPORT virtual std::string textY();
+  /// Returns the Z text value
+  GEOMDATA_EXPORT virtual std::string textZ();
+
+  /// 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:
+ protected:
   /// Initializes attributes
   GEOMDATA_EXPORT GeomData_Point(TDF_Label& theLabel);