X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI.i;h=7da97d0c182ff97c2324541f1e984eb16cd2ca3e;hb=506a83727ca8f8297fc1dcdf4ea40d7865c35450;hp=ff4b9e7adaea62d7dc512f267b4ae77030c84cbc;hpb=8e8ae7ea1f566f320bc38ed819ce03fc5dc55e73;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI.i b/src/ModelAPI/ModelAPI.i
index ff4b9e7ad..7da97d0c1 100644
--- a/src/ModelAPI/ModelAPI.i
+++ b/src/ModelAPI/ModelAPI.i
@@ -9,9 +9,8 @@
 }
 
 %{
-  #include "GeomAPI_Interface.h"
-  #include "GeomAPI_Shape.h"
   #include "ModelAPI.h"
+  #include "ModelAPI_Entity.h"
   #include "ModelAPI_Document.h"
   #include "ModelAPI_Session.h"
   #include "ModelAPI_Object.h"
@@ -37,23 +36,27 @@
   #include "ModelAPI_ResultConstruction.h"
   #include "ModelAPI_ResultBody.h"
   #include "ModelAPI_ResultPart.h"
-  #include "ModelAPI_ResultParameters.h"
+  #include "ModelAPI_ResultParameter.h"
   #include "ModelAPI_ResultGroup.h"
   #include "ModelAPI_Tools.h"
+  #include "ModelAPI_ResultCompSolid.h"
+  
+  #include <memory>
+  #include <string>
   
   template<class T1, class T2> 
   std::shared_ptr<T1> shared_ptr_cast(std::shared_ptr<T2> theObject)
   { 
     return std::dynamic_pointer_cast<T1>(theObject); 
   }
-  
+
 %}
 
 // to avoid error on this
 #define MODELAPI_EXPORT
-#define GEOMAPI_EXPORT
 
 // standard definitions
+%include "GeomAPI.i"
 %include "typemaps.i"
 %include "std_string.i"
 %include "std_list.i"
@@ -68,8 +71,7 @@
 
 // shared pointers
 // For ModelAPI_ResultConstruction.shape()
-%shared_ptr(GeomAPI_Interface)
-%shared_ptr(GeomAPI_Shape)
+%shared_ptr(ModelAPI_Entity)
 %shared_ptr(ModelAPI_Document)
 %shared_ptr(ModelAPI_Session)
 %shared_ptr(ModelAPI_Plugin)
@@ -96,11 +98,11 @@
 %shared_ptr(ModelAPI_ResultBody)
 %shared_ptr(ModelAPI_ResultPart)
 %shared_ptr(ModelAPI_ResultGroup)
-%shared_ptr(ModelAPI_ResultParameters)
+%shared_ptr(ModelAPI_ResultParameter)
+%shared_ptr(ModelAPI_ResultCompSolid)
 
 // all supported interfaces
-%include "GeomAPI_Interface.h"
-%include "GeomAPI_Shape.h"
+%include "ModelAPI_Entity.h"
 %include "ModelAPI_Document.h"
 %include "ModelAPI_Session.h"
 %include "ModelAPI_Plugin.h"
@@ -127,8 +129,9 @@
 %include "ModelAPI_ResultBody.h"
 %include "ModelAPI_ResultPart.h"
 %include "ModelAPI_ResultGroup.h"
-%include "ModelAPI_ResultParameters.h"
+%include "ModelAPI_ResultParameter.h"
 %include "ModelAPI_Tools.h"
+%include "ModelAPI_ResultCompSolid.h"
 
 // std::list -> [] 
 %template(ObjectList) std::list<std::shared_ptr<ModelAPI_Object> >;
@@ -137,14 +140,17 @@
 
 // std::dynamic_pointer_cast
 template<class T1, class T2> std::shared_ptr<T1> shared_ptr_cast(std::shared_ptr<T2> theObject);
-%template(modelAPI_CompositeFeature) shared_ptr_cast<ModelAPI_CompositeFeature, ModelAPI_Feature>;
-%template(modelAPI_Feature) shared_ptr_cast<ModelAPI_Feature, ModelAPI_Object>;
+%template(featureToCompositeFeature) shared_ptr_cast<ModelAPI_CompositeFeature, ModelAPI_Feature>;
+%template(objectToFeature) shared_ptr_cast<ModelAPI_Feature, ModelAPI_Object>;
+%template(compositeFeatureToFeature) shared_ptr_cast<ModelAPI_Feature, ModelAPI_CompositeFeature>;
 
 %template(modelAPI_Result) shared_ptr_cast<ModelAPI_Result, ModelAPI_Object>;
 %template(modelAPI_ResultConstruction) shared_ptr_cast<ModelAPI_ResultConstruction, ModelAPI_Result>;
 %template(modelAPI_ResultBody) shared_ptr_cast<ModelAPI_ResultBody, ModelAPI_Result>;
 %template(modelAPI_ResultPart) shared_ptr_cast<ModelAPI_ResultPart, ModelAPI_Result>;
+%template(modelAPI_ResultParameter) shared_ptr_cast<ModelAPI_ResultParameter, ModelAPI_Result>;
 %template(modelAPI_ResultGroup) shared_ptr_cast<ModelAPI_ResultPart, ModelAPI_ResultGroup>;
+%template(modelAPI_ResultCompSolid) shared_ptr_cast<ModelAPI_ResultCompSolid, ModelAPI_ResultBody>;
 
 // Attribute casts
 %template(modelAPI_AttributeDocRef)        shared_ptr_cast<ModelAPI_AttributeDocRef, ModelAPI_Attribute>;