X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FConstructionAPI%2FConstructionAPI_Point.h;h=d2af332986b9a2c43d25bee8ccd1fd9e702a7aef;hb=ec7b76c46167e93cff3dc39849253e04ff091e5f;hp=0612227e753bca80f76e67a154aaac00d7a8f04a;hpb=7133bd57dc1b1187f4f682446cae82f3e0724e41;p=modules%2Fshaper.git

diff --git a/src/ConstructionAPI/ConstructionAPI_Point.h b/src/ConstructionAPI/ConstructionAPI_Point.h
index 0612227e7..d2af33298 100644
--- a/src/ConstructionAPI/ConstructionAPI_Point.h
+++ b/src/ConstructionAPI/ConstructionAPI_Point.h
@@ -10,7 +10,10 @@
 //--------------------------------------------------------------------------------------
 #include "ConstructionAPI.h"
 
+#include <ConstructionPlugin_Point.h>
+
 #include <ModelHighAPI_Interface.h>
+#include <ModelHighAPI_Macro.h>
 //--------------------------------------------------------------------------------------
 class ModelAPI_AttributeDouble;
 class ModelAPI_Document;
@@ -18,46 +21,45 @@ class ModelHighAPI_Double;
 //--------------------------------------------------------------------------------------
 /**\class ConstructionAPI_Point
  * \ingroup CPPHighAPI
- * \brief C++ HighAPI interface for Point feature
+ * \brief Interface for Point feature
  */
 class ConstructionAPI_Point : public ModelHighAPI_Interface
 {
 public:
-  /// Constructor
+  /// Constructor without values
+  CONSTRUCTIONAPI_EXPORT
   explicit ConstructionAPI_Point(const std::shared_ptr<ModelAPI_Feature> & theFeature);
   /// Constructor with values
+  CONSTRUCTIONAPI_EXPORT
   ConstructionAPI_Point(const std::shared_ptr<ModelAPI_Feature> & theFeature,
                         const ModelHighAPI_Double & theX,
                         const ModelHighAPI_Double & theY,
                         const ModelHighAPI_Double & theZ);
   /// Destructor
+  CONSTRUCTIONAPI_EXPORT
   virtual ~ConstructionAPI_Point();
 
+  INTERFACE_3(ConstructionPlugin_Point::ID(),
+              x, ConstructionPlugin_Point::X(), ModelAPI_AttributeDouble, /** X attribute */,
+              y, ConstructionPlugin_Point::Y(), ModelAPI_AttributeDouble, /** Y attribute */,
+              z, ConstructionPlugin_Point::Z(), ModelAPI_AttributeDouble, /** Z attribute */
+  )
+
   /// Set point values
+  CONSTRUCTIONAPI_EXPORT
   void setPoint(const ModelHighAPI_Double & theX,
                 const ModelHighAPI_Double & theY,
                 const ModelHighAPI_Double & theZ);
-
-  /// X coordinate for the point
-  std::shared_ptr<ModelAPI_AttributeDouble> x() const;
-  /// Y coordinate for the point
-  std::shared_ptr<ModelAPI_AttributeDouble> y() const;
-  /// Z coordinate for the point
-  std::shared_ptr<ModelAPI_AttributeDouble> z() const;
-
-protected:
-  std::shared_ptr<ModelAPI_AttributeDouble> myX, myY, myZ;
-
-  bool initialize();
 };
 
-//! Pointer on point object
+//! Pointer on Point object
 typedef std::shared_ptr<ConstructionAPI_Point> PointPtr;
 
 /**\ingroup CPPHighAPI
- * \brief C++ HighAPI function for creating Point feature
+ * \brief Create Point feature
  */
-PointPtr addPoint(std::shared_ptr<ModelAPI_Document> thePart,
+CONSTRUCTIONAPI_EXPORT
+PointPtr addPoint(const std::shared_ptr<ModelAPI_Document> & thePart,
                   const ModelHighAPI_Double & theX,
                   const ModelHighAPI_Double & theY,
                   const ModelHighAPI_Double & theZ);