Use headers from *Plugin in C++ High API *API

diff --git a/src/ConstructionAPI/CMakeLists.txt b/src/ConstructionAPI/CMakeLists.txt
index b79f655cc456cf0f302d90da938f13288907aea1..04785d5592b10788542627a6c89e5e849be433a2 100644 (file)
--- a/src/ConstructionAPI/CMakeLists.txt
+++ b/src/ConstructionAPI/CMakeLists.txt
@@ -24,6 +24,12 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
 )
 
+# Plugin headers dependency
+INCLUDE_DIRECTORIES(
+  ${PROJECT_SOURCE_DIR}/src/GeomAPI
+  ${PROJECT_SOURCE_DIR}/src/ConstructionPlugin
+)
+
 #TODO(spo): is ${CAS_DEFINITIONS} necessary?
 ADD_DEFINITIONS(-DCONSTRUCTIONAPI_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(ConstructionAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})

diff --git a/src/ConstructionAPI/ConstructionAPI_Plane.h b/src/ConstructionAPI/ConstructionAPI_Plane.h
index 1bc510179af689f10b104ff660073d65c44d072d..b1dbfcc70260551d853086f0da1a4a10387c6b5c 100644 (file)
--- a/src/ConstructionAPI/ConstructionAPI_Plane.h
+++ b/src/ConstructionAPI/ConstructionAPI_Plane.h
@@ -10,6 +10,8 @@
 //--------------------------------------------------------------------------------------
 #include "ConstructionAPI.h"
 
+#include <ConstructionPlugin_Plane.h>
+
 #include <ModelHighAPI_Interface.h>
 #include <ModelHighAPI_Macro.h>
 //--------------------------------------------------------------------------------------
@@ -42,14 +44,14 @@ public:
   CONSTRUCTIONAPI_EXPORT
   virtual ~ConstructionAPI_Plane();
 
-  INTERFACE_7("Plane",
-              creationMethod, "CreationMethod", String, /** Creation method */,
-              face, "planeFace", Selection, /** Plane face */,
-              distance, "distance", Double, /** Distance */,
-              A, "A", Double, /** Parameter A for general equation */,
-              B, "B", Double, /** Parameter B for general equation */,
-              C, "C", Double, /** Parameter C for general equation */,
-              D, "D", Double, /** Parameter D for general equation */
+  INTERFACE_7(ConstructionPlugin_Plane::ID(),
+              creationMethod, ConstructionPlugin_Plane::METHOD(), String, /** Creation method */,
+              face, ConstructionPlugin_Plane::FACE(), Selection, /** Plane face */,
+              distance, ConstructionPlugin_Plane::DISTANCE(), Double, /** Distance */,
+              A, ConstructionPlugin_Plane::A(), Double, /** Parameter A for general equation */,
+              B, ConstructionPlugin_Plane::B(), Double, /** Parameter B for general equation */,
+              C, ConstructionPlugin_Plane::C(), Double, /** Parameter C for general equation */,
+              D, ConstructionPlugin_Plane::D(), Double, /** Parameter D for general equation */
   )
 
   /// Set face and distance

diff --git a/src/ConstructionAPI/ConstructionAPI_Point.h b/src/ConstructionAPI/ConstructionAPI_Point.h
index 7edd813c591c8ec159e799df5240edbdcff71a99..f1c67a34709bd56af87482464278cd78ac2626cb 100644 (file)
--- a/src/ConstructionAPI/ConstructionAPI_Point.h
+++ b/src/ConstructionAPI/ConstructionAPI_Point.h
@@ -10,6 +10,8 @@
 //--------------------------------------------------------------------------------------
 #include "ConstructionAPI.h"
 
+#include <ConstructionPlugin_Point.h>
+
 #include <ModelHighAPI_Interface.h>
 #include <ModelHighAPI_Macro.h>
 //--------------------------------------------------------------------------------------
@@ -37,10 +39,10 @@ public:
   CONSTRUCTIONAPI_EXPORT
   virtual ~ConstructionAPI_Point();
 
-  INTERFACE_3("Point",
-              x, "x", Double, /** X attribute */,
-              y, "y", Double, /** Y attribute */,
-              z, "z", Double, /** Z attribute */)
+  INTERFACE_3(ConstructionPlugin_Point::ID(),
+              x, ConstructionPlugin_Point::X(), Double, /** X attribute */,
+              y, ConstructionPlugin_Point::Y(), Double, /** Y attribute */,
+              z, ConstructionPlugin_Point::Z(), Double, /** Z attribute */)
 
   /// Set point values
   CONSTRUCTIONAPI_EXPORT