X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomData%2FGeomData_Point.h;h=cbd9d5f84b81537bb67966e0201aceec34215d19;hb=2ab502106663ac32f9a5d87e4fdc950f5ac6f6b7;hp=30ac5310ff695d4ef5e15d055ce7b073e66013b9;hpb=1160728f79c0125d3aa299e244074aff2a3a3ec6;p=modules%2Fshaper.git

diff --git a/src/GeomData/GeomData_Point.h b/src/GeomData/GeomData_Point.h
index 30ac5310f..cbd9d5f84 100644
--- a/src/GeomData/GeomData_Point.h
+++ b/src/GeomData/GeomData_Point.h
@@ -1,29 +1,41 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomData_Point.h
-// Created:     24 Apr 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef GeomData_Point_H_
 #define GeomData_Point_H_
 
 #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);
@@ -36,13 +48,30 @@ class GeomData_Point : public GeomDataAPI_Point
   GEOMDATA_EXPORT virtual double y() const;
   /// Returns the Z double value
   GEOMDATA_EXPORT virtual double z() const;
+  /// Defines the X coordinate value
+  GEOMDATA_EXPORT void setX(const double theX);
+  /// Defines the Y coordinate value
+  GEOMDATA_EXPORT void setY(const double theY);
+  /// Defines the Z coordinate value
+  GEOMDATA_EXPORT void setZ(const double theZ);
+
   /// 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,
                                        const std::string& theZ);
+  /// Defines the X text value
+  GEOMDATA_EXPORT virtual void setTextX(const std::string& theX);
+  /// Defines the Y text value
+  GEOMDATA_EXPORT virtual void setTextY(const std::string& theY);
+  /// Defines the Z text value
+  GEOMDATA_EXPORT virtual void setTextZ(const std::string& theZ);
 
   /// Returns the X text value
   GEOMDATA_EXPORT virtual std::string textX();
@@ -57,9 +86,24 @@ class GeomData_Point : public GeomDataAPI_Point
   /// 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;
 };