Merge branch 'Dev_1.3.0' of newgeom:newgeom into Dev_1.3.0

[modules/shaper.git] / src / GeomData / GeomData_Point2D.h

diff --git a/src/GeomData/GeomData_Point2D.h b/src/GeomData/GeomData_Point2D.h
index 8e3c124b3d45515ee57177707277c7035bf38d25..8a41a4c0c5056613619939b2bd0aabcebd914204 100644 (file)
--- a/src/GeomData/GeomData_Point2D.h
+++ b/src/GeomData/GeomData_Point2D.h
@@ -1,13 +1,17 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomData_Point2D.h
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomData_Point2D_HeaderFile
-#define GeomData_Point2D_HeaderFile
+#ifndef GeomData_Point2D_H_
+#define GeomData_Point2D_H_
 
 #include "GeomData.h"
 #include "GeomDataAPI_Point2D.h"
 #include <TDataStd_RealArray.hxx>
+#include <TDataStd_ExtStringArray.hxx>
+#include <TDataStd_BooleanArray.hxx>
 #include <TDF_Label.hxx>
 
 /**\class GeomData_Point2D
@@ -17,21 +21,37 @@
 
 class GeomData_Point2D : public GeomDataAPI_Point2D
 {
-  Handle_TDataStd_RealArray myCoords; ///< X and Y doubles as real array attribute [0; 1]
-public:
+  Handle_TDataStd_RealArray myCoords;  ///< X and Y doubles as real array attribute [0; 1]
+  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]
+ public:
   /// Defines the double value
   GEOMDATA_EXPORT virtual void setValue(const double theX, const double theY);
   /// Defines the point
-  GEOMDATA_EXPORT virtual void setValue(const boost::shared_ptr<GeomAPI_Pnt2d>& thePoint);
+  GEOMDATA_EXPORT virtual void setValue(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint);
 
   /// Returns the X double value
   GEOMDATA_EXPORT virtual double x() const;
   /// Returns the Y double value
   GEOMDATA_EXPORT virtual double y() const;
   /// Returns the 2D point
-  GEOMDATA_EXPORT virtual boost::shared_ptr<GeomAPI_Pnt2d> pnt();
+  GEOMDATA_EXPORT virtual std::shared_ptr<GeomAPI_Pnt2d> pnt();
+
+  /// Defines the double values
+  GEOMDATA_EXPORT virtual void setText(const std::string& theX,
+                                       const std::string& theY);
+
+  /// Returns the double 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);
 
-protected:
+ protected:
   /// Initializes attributes
   GEOMDATA_EXPORT GeomData_Point2D(TDF_Label& theLabel);