X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomDataAPI%2FGeomDataAPI_Point.h;h=ffa07285da1df05d445247c5f30eefba756d4aee;hb=e32f95642855a63da2727cb324ce2a75632a712f;hp=cc5f4f6f09a4e892fc6175df6c7cbfc24fe3a91d;hpb=4783f146b71a48c651523fcf0e12367bcf3d1fa8;p=modules%2Fshaper.git

diff --git a/src/GeomDataAPI/GeomDataAPI_Point.h b/src/GeomDataAPI/GeomDataAPI_Point.h
index cc5f4f6f0..ffa07285d 100644
--- a/src/GeomDataAPI/GeomDataAPI_Point.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomDataAPI_Point.h
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
@@ -8,6 +10,8 @@
 #include "GeomDataAPI.h"
 #include <ModelAPI_Attribute.h>
 
+#include <set>
+
 class GeomAPI_Pnt;
 
 /**\class GeomDataAPI_Point
@@ -19,36 +23,75 @@ class GeomDataAPI_Point : public ModelAPI_Attribute
 {
  public:
   /// Defines the double value
-  virtual void setValue(const double theX, const double theY, const double theZ) = 0;
+  GEOMDATAAPI_EXPORT virtual void setValue(const double theX, const double theY, const double theZ) = 0;
   /// Defines the point
-  virtual void setValue(const std::shared_ptr<GeomAPI_Pnt>& thePoint) = 0;
+  GEOMDATAAPI_EXPORT virtual void setValue(const std::shared_ptr<GeomAPI_Pnt>& thePoint) = 0;
 
   /// Returns the X double value
-  virtual double x() const = 0;
+  GEOMDATAAPI_EXPORT virtual double x() const = 0;
   /// Returns the Y double value
-  virtual double y() const = 0;
+  GEOMDATAAPI_EXPORT virtual double y() const = 0;
   /// Returns the Z double value
-  virtual double z() const = 0;
+  GEOMDATAAPI_EXPORT virtual double z() const = 0;
   /// Returns the 3D point
-  virtual std::shared_ptr<GeomAPI_Pnt> pnt() = 0;
+  GEOMDATAAPI_EXPORT virtual std::shared_ptr<GeomAPI_Pnt> pnt() = 0;
+
+  /// Defines the calculated double value
+  GEOMDATAAPI_EXPORT virtual void setCalculatedValue(const double theX, const double theY, const double theZ) = 0;
+  
+  /// Defines the text values
+  GEOMDATAAPI_EXPORT virtual void setText(const std::string& theX,
+                                          const std::string& theY,
+                                          const std::string& theZ) = 0;
+
+  /// Returns the text value for X
+  GEOMDATAAPI_EXPORT virtual std::string textX() = 0;
+  /// Returns the text value for Y
+  GEOMDATAAPI_EXPORT virtual std::string textY() = 0;
+  /// Returns the text value for Z
+  GEOMDATAAPI_EXPORT virtual std::string textZ() = 0;
+
+  /// Point component (x,y,z)
+  enum PointComponent { C_X = 0,
+                        C_Y = 1,
+                        C_Z = 2,
+  };
+
+  /// Allows to set expression (text) as invalid (by the parameters listener)
+  GEOMDATAAPI_EXPORT virtual void setExpressionInvalid(int theComponent, const bool theFlag) = 0;
+
+  /// Returns true if text is invalid
+  GEOMDATAAPI_EXPORT virtual bool expressionInvalid(int theComponent) = 0;
+
+  /// Allows to set expression (text) error (by the parameters listener)
+  GEOMDATAAPI_EXPORT virtual void setExpressionError(int theComponent, const std::string& theError) = 0;
+
+  /// Returns an expression error
+  GEOMDATAAPI_EXPORT virtual std::string expressionError(int theComponent) = 0;
+
+  /// Defines the used parameters
+  GEOMDATAAPI_EXPORT virtual void setUsedParameters(int theComponent, 
+    const std::set<std::string>& theUsedParameters) = 0;
+
+  /// Returns the used parameters
+  GEOMDATAAPI_EXPORT virtual std::set<std::string> usedParameters(int theComponent) const = 0;
 
   /// Returns the type of this class of attributes
-  static inline std::string type()
+  static std::string typeId()
   {
     return std::string("Point");
   }
 
   /// Returns the type of this class of attributes, not static method
-  virtual std::string attributeType()
-  {
-    return type();
-  }
+  GEOMDATAAPI_EXPORT virtual std::string attributeType();
 
  protected:
   /// Objects are created for features automatically
-  GeomDataAPI_Point()
-  {
-  }
+  GEOMDATAAPI_EXPORT GeomDataAPI_Point();
+  GEOMDATAAPI_EXPORT virtual ~GeomDataAPI_Point();
 };
 
+//! Pointer on attribute object
+typedef std::shared_ptr<GeomDataAPI_Point> AttributePointPtr;
+
 #endif