Add GeomAPI to ModelHighAPI and others

diff --git a/src/GeomDataAPI/GeomDataAPI.i b/src/GeomDataAPI/GeomDataAPI.i
index df40992c95607145582756d26e216421605faf1b..c7eb5e74f5afd6450fe7b938f9b15e51d42a11a9 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI.i
+++ b/src/GeomDataAPI/GeomDataAPI.i
@@ -5,6 +5,7 @@
 %}
 
 // import other modules
+%import "GeomAPI.i"
 %import "ModelAPI.i"
 
 // to avoid error on this

diff --git a/src/GeomDataAPI/GeomDataAPI_swig.h b/src/GeomDataAPI/GeomDataAPI_swig.h
index aecd5ce2ba3c40e18d9bd003dddbbf2acada3514..19beeec778b5ce308cffb17dc8e2d325b735f0ee 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI_swig.h
+++ b/src/GeomDataAPI/GeomDataAPI_swig.h
@@ -7,6 +7,7 @@
 #ifndef SRC_GEOMDATAAPI_GEOMDATAAPI_SWIG_H_
 #define SRC_GEOMDATAAPI_GEOMDATAAPI_SWIG_H_
 
+  #include <GeomAPI_swig.h>
   #include <ModelAPI_swig.h>
 
   #include "GeomDataAPI.h"

diff --git a/src/ModelAPI/ModelAPI_swig.h b/src/ModelAPI/ModelAPI_swig.h
index debe43e1538c06c87ae4c1993779fdd87a7cca0b..377d1182db3fa9e420df505ce19f08318618463a 100644 (file)
--- a/src/ModelAPI/ModelAPI_swig.h
+++ b/src/ModelAPI/ModelAPI_swig.h
@@ -7,7 +7,7 @@
 #ifndef SRC_MODELAPI_MODELAPI_SWIG_H_
 #define SRC_MODELAPI_MODELAPI_SWIG_H_
 
-  #include "GeomAPI_swig.h"
+  #include <GeomAPI_swig.h>
 
   #include "ModelAPI.h"
   #include "ModelAPI_Entity.h"

diff --git a/src/ModelHighAPI/ModelHighAPI.i b/src/ModelHighAPI/ModelHighAPI.i
index 7bea7bc27ce48de52ab4b89d594958615b4c6540..418a46baa48b97058195c4627b252608e5bd3023 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI.i
+++ b/src/ModelHighAPI/ModelHighAPI.i
@@ -11,6 +11,7 @@
 %include "doxyhelp.i"
 
 // import other modules
+%import "GeomAPI.i"
 %import "ModelAPI.i"
 %import "GeomDataAPI.i"
 
@@ -111,9 +112,9 @@
 %include "ModelHighAPI_Double.h"
 %include "ModelHighAPI_Integer.h"
 %include "ModelHighAPI_Interface.h"
-%include "ModelHighAPI_Macro.h"
 %include "ModelHighAPI_RefAttr.h"
 %include "ModelHighAPI_Selection.h"
+%include "ModelHighAPI_Macro.h"
 %include "ModelHighAPI_Tools.h"
 
 %template(SelectionList) std::list<ModelHighAPI_Selection>;

diff --git a/src/ModelHighAPI/ModelHighAPI_swig.h b/src/ModelHighAPI/ModelHighAPI_swig.h
index 01d0afd43255b3323e5bc30bb4a0474876c30c1a..46780acfdb60c78fc4b4a7b0d2f9b16cbc63632b 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_swig.h
+++ b/src/ModelHighAPI/ModelHighAPI_swig.h
@@ -7,6 +7,7 @@
 #ifndef SRC_MODELHIGHAPI_MODELHIGHAPI_SWIG_H_
 #define SRC_MODELHIGHAPI_MODELHIGHAPI_SWIG_H_
 
+  #include <GeomAPI_swig.h>
   #include <ModelAPI_swig.h>
   #include <GeomDataAPI_swig.h>
 

diff --git a/src/SketchAPI/CMakeLists.txt b/src/SketchAPI/CMakeLists.txt
index 261c4e4dbe6e67f98554a012ff0488c8807973bc..0659417de8a88d0c3e011f6fe977d2b9e1a336a4 100644 (file)
--- a/src/SketchAPI/CMakeLists.txt
+++ b/src/SketchAPI/CMakeLists.txt
@@ -24,8 +24,9 @@ SET(PROJECT_LIBRARIES
 
 INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/Events
-  ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
+  ${PROJECT_SOURCE_DIR}/src/GeomAPI
   ${PROJECT_SOURCE_DIR}/src/ModelAPI
+  ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
   ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
 )
 

diff --git a/src/SketchAPI/SketchAPI.i b/src/SketchAPI/SketchAPI.i
index d0d566de42b2ec404c6252653e3f3d43af95a8de..2c5fb703526d23543e8a048eb7db1595a47efc32 100644 (file)
--- a/src/SketchAPI/SketchAPI.i
+++ b/src/SketchAPI/SketchAPI.i
@@ -25,8 +25,8 @@
 %shared_ptr(SketchAPI_Sketch)
 %shared_ptr(SketchAPI_SketchEntity)
 
-// all supported interfaces
+// all supported interfaces (the order is very important: base class first)
+%include "SketchAPI_SketchEntity.h"
 %include "SketchAPI_Circle.h"
 %include "SketchAPI_Line.h"
 %include "SketchAPI_Sketch.h"
-%include "SketchAPI_SketchEntity.h"