Cleare Macros for easy atribute initialization in C++HighAPI interfaces

[modules/shaper.git] / src / ConstructionAPI / ConstructionAPI_Point.h

diff --git a/src/ConstructionAPI/ConstructionAPI_Point.h b/src/ConstructionAPI/ConstructionAPI_Point.h
index 56d3a57169cbed9a88eeeba9935c8cd561496f39..aef5b8150ad4f0e236215f4efd78db29963ac42c 100644 (file)
--- a/src/ConstructionAPI/ConstructionAPI_Point.h
+++ b/src/ConstructionAPI/ConstructionAPI_Point.h
@@ -11,6 +11,7 @@
 #include "ConstructionAPI.h"
 
 #include <ModelHighAPI_Interface.h>
+#include <ModelHighAPI_Macro.h>
 //--------------------------------------------------------------------------------------
 class ModelAPI_AttributeDouble;
 class ModelAPI_Document;
@@ -23,7 +24,7 @@ class ModelHighAPI_Double;
 class ConstructionAPI_Point : public ModelHighAPI_Interface
 {
 public:
-  /// Constructor
+  /// Constructor without values
   explicit ConstructionAPI_Point(const std::shared_ptr<ModelAPI_Feature> & theFeature);
   /// Constructor with values
   ConstructionAPI_Point(const std::shared_ptr<ModelAPI_Feature> & theFeature,
@@ -33,31 +34,24 @@ public:
   /// Destructor
   virtual ~ConstructionAPI_Point();
 
+  INTERFACE_3("Point",
+              x, "x", Double, /** X attribute */,
+              y, "y", Double, /** Y attribute */,
+              z, "z", Double, /** Z attribute */)
+
   /// Set point values
   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 Create Point feature
  */
-PointPtr addPoint(std::shared_ptr<ModelAPI_Document> thePart,
+PointPtr addPoint(const std::shared_ptr<ModelAPI_Document> & thePart,
                   const ModelHighAPI_Double & theX,
                   const ModelHighAPI_Double & theY,
                   const ModelHighAPI_Double & theZ);