Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

[modules/shaper.git] / src / ConstructionPlugin / ConstructionPlugin_Point.h

diff --git a/src/ConstructionPlugin/ConstructionPlugin_Point.h b/src/ConstructionPlugin/ConstructionPlugin_Point.h
index 03f9d3a9f2b5d11bc172aeb99cd34d891c074424..f4bf39a1186fdc61b3ee35e42f3665a8b7a609fa 100644 (file)
--- a/src/ConstructionPlugin/ConstructionPlugin_Point.h
+++ b/src/ConstructionPlugin/ConstructionPlugin_Point.h
@@ -11,19 +11,6 @@
 #include <ModelAPI_Feature.h>
 #include <GeomAPI_ICustomPrs.h>
 
-
-/// Point kind
-const std::string CONSTRUCTION_POINT_KIND("Point");
-
-/// attribute name for X coordinate
-const std::string POINT_ATTR_X = "x";
-/// attribute name for Y coordinate
-const std::string POINT_ATTR_Y = "y";
-/// attribute name for Z coordinate
-const std::string POINT_ATTR_Z = "z";
-
-#define CONSTRUCTION_POINT_COLOR "#ffff00"
-
 /**\class ConstructionPlugin_Point
  * \ingroup Plugins
  * \brief Feature for creation of the new part in PartSet.
@@ -32,10 +19,38 @@ class ConstructionPlugin_Point : public ModelAPI_Feature, public GeomAPI_ICustom
 {
  public:
   /// Returns the kind of a feature
-  CONSTRUCTIONPLUGIN_EXPORT virtual const std::string& getKind()
+  CONSTRUCTIONPLUGIN_EXPORT virtual const std::string& getKind();
+
+  inline static const std::string& ID()
+  {
+    static const std::string CONSTRUCTION_POINT_KIND("Point");
+    return CONSTRUCTION_POINT_KIND;
+  }
+
+  /// default color for a point
+  inline static const std::string& DEFAULT_COLOR()
+  {
+    static const std::string CONSTRUCTION_POINT_COLOR("#ffff00");
+    return CONSTRUCTION_POINT_COLOR;
+  }
+
+  /// attribute name for X coordinate
+  inline static const std::string& X()
+  {
+    static const std::string POINT_ATTR_X("x");
+    return POINT_ATTR_X;
+  }
+  /// attribute name for Y coordinate
+  inline static const std::string& Y()
+  {
+    static const std::string POINT_ATTR_Y("y");
+    return POINT_ATTR_Y;
+  }
+  /// attribute name for Z coordinate
+  inline static const std::string& Z()
   {
-    static std::string MY_KIND = CONSTRUCTION_POINT_KIND;
-    return MY_KIND;
+    static const std::string POINT_ATTR_Z("z");
+    return POINT_ATTR_Z;
   }
 
   /// Creates a new part document if needed