From: spo Date: Tue, 14 Jun 2016 12:15:57 +0000 (+0300) Subject: Add GeomAPI to ModelHighAPI and others X-Git-Tag: V_2.4.0~91^2~51 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=399f86112fbe674313a1e7e17d592fdac7c9a62e;p=modules%2Fshaper.git Add GeomAPI to ModelHighAPI and others --- diff --git a/src/GeomDataAPI/GeomDataAPI.i b/src/GeomDataAPI/GeomDataAPI.i index df40992c9..c7eb5e74f 100644 --- 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 aecd5ce2b..19beeec77 100644 --- 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 #include #include "GeomDataAPI.h" diff --git a/src/ModelAPI/ModelAPI_swig.h b/src/ModelAPI/ModelAPI_swig.h index debe43e15..377d1182d 100644 --- 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 #include "ModelAPI.h" #include "ModelAPI_Entity.h" diff --git a/src/ModelHighAPI/ModelHighAPI.i b/src/ModelHighAPI/ModelHighAPI.i index 7bea7bc27..418a46baa 100644 --- 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; diff --git a/src/ModelHighAPI/ModelHighAPI_swig.h b/src/ModelHighAPI/ModelHighAPI_swig.h index 01d0afd43..46780acfd 100644 --- 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 #include #include diff --git a/src/SketchAPI/CMakeLists.txt b/src/SketchAPI/CMakeLists.txt index 261c4e4db..0659417de 100644 --- 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 d0d566de4..2c5fb7035 100644 --- 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"