Fix compilation problems

[modules/shaper.git] / src / ModelAPI / ModelAPI.i

diff --git a/src/ModelAPI/ModelAPI.i b/src/ModelAPI/ModelAPI.i
index 7c0466cdb0152f1ac71ea99f8dd0f5af10bec3b4..e5113a5c2fea4df2c8dcad75153abfaab8196014 100644 (file)
--- a/src/ModelAPI/ModelAPI.i
+++ b/src/ModelAPI/ModelAPI.i
@@ -30,6 +30,9 @@
 
 %{
   #include "ModelAPI_swig.h"
+
+  // fix for SWIG v2.0.4
+  #define SWIGPY_SLICE_ARG(obj) ((PyObject*)(obj))
 %}
 
 // import other modules
@@ -51,6 +54,7 @@
 %feature("director") ModelAPI_Feature;
 %feature("director") ModelAPI_CompositeFeature;
 %feature("director") ModelAPI_Data;
+%feature("director") ModelAPI_Folder;
 
 // shared pointers
 // For ModelAPI_ResultConstruction.shape()
@@ -62,6 +66,7 @@
 %shared_ptr(ModelAPI_Feature)
 %shared_ptr(ModelAPI_CompositeFeature)
 %shared_ptr(ModelAPI_Data)
+%shared_ptr(ModelAPI_Folder)
 %shared_ptr(ModelAPI_Attribute)
 %shared_ptr(ModelAPI_AttributeDocRef)
 %shared_ptr(ModelAPI_AttributeDouble)
@@ -91,22 +96,22 @@
 %shared_ptr(ModelAPI_ResultCompSolid)
 
 %typecheck(SWIG_TYPECHECK_POINTER) const ModelAPI_AttributeTables::Value {
-  $1 = (PyFloat_Check($input) || PyInt_Check($input) || PyLong_Check($input) || PyString_Check($input) || PyBool_Check($input)) ? 1 : 0;
+  $1 = (PyFloat_Check($input) || PyLong_Check($input) || PyUnicode_Check($input) || PyBool_Check($input)) ? 1 : 0;
 }
 
 // Tables Value reading as int, double, boolean or string
 %typemap(in) const ModelAPI_AttributeTables::Value {
-  if (PyInt_Check($input)) {
-    $1.myInt = int(PyInt_AsLong($input));
-    $1.myDouble = double(PyInt_AsLong($input));
-    $1.myBool = PyInt_AsLong($input) != 0;
+  if (PyLong_Check($input)) {
+    $1.myInt = int(PyLong_AsLong($input));
+    $1.myDouble = double(PyLong_AsLong($input));
+    $1.myBool = PyLong_AsLong($input) != 0;
   } else if (PyFloat_Check($input)) {
     $1.myInt = int(PyFloat_AsDouble($input));
     $1.myDouble = PyFloat_AsDouble($input);
   } else if (PyBool_Check($input)) {
     $1.myBool = $input == Py_True;
-  } else if (PyString_Check($input)) {
-    $1.myStr = PyString_AsString($input);
+  } else if (PyUnicode_Check($input)) {
+    $1.myStr = PyUnicode_AsUTF8($input);
   } else if ((SWIG_ConvertPtr($input, (void **)&$1, $1_descriptor, SWIG_POINTER_EXCEPTION)) == 0) {
   } else {
     PyErr_SetString(PyExc_ValueError, "Tables value must be int, double, string or bool.");
@@ -114,6 +119,8 @@
   }
 }
 
+%apply int& OUTPUT {int& theIndexInFolder};
+
 // all supported interfaces
 %include "ModelAPI_Entity.h"
 %include "ModelAPI_Document.h"
@@ -150,7 +157,7 @@
 %include "ModelAPI_ResultField.h"
 %include "ModelAPI_ResultParameter.h"
 %include "ModelAPI_Tools.h"
-%include "ModelAPI_ResultCompSolid.h"
+%include "ModelAPI_Folder.h"
 
 // std::list -> []
 %template(StringList) std::list<std::string>;
@@ -167,6 +174,7 @@ template<class T1, class T2> std::shared_ptr<T1> shared_ptr_cast(std::shared_ptr
 %template(featureToCompositeFeature) shared_ptr_cast<ModelAPI_CompositeFeature, ModelAPI_Feature>;
 %template(objectToFeature) shared_ptr_cast<ModelAPI_Feature, ModelAPI_Object>;
 %template(objectToResult) shared_ptr_cast<ModelAPI_Result, ModelAPI_Object>;
+%template(objectToFolder) shared_ptr_cast<ModelAPI_Folder, ModelAPI_Object>;
 %template(compositeFeatureToFeature) shared_ptr_cast<ModelAPI_Feature, ModelAPI_CompositeFeature>;
 
 %template(modelAPI_Result) shared_ptr_cast<ModelAPI_Result, ModelAPI_Object>;
@@ -176,7 +184,6 @@ template<class T1, class T2> std::shared_ptr<T1> shared_ptr_cast(std::shared_ptr
 %template(modelAPI_ResultParameter) shared_ptr_cast<ModelAPI_ResultParameter, ModelAPI_Result>;
 %template(modelAPI_ResultGroup) shared_ptr_cast<ModelAPI_ResultPart, ModelAPI_ResultGroup>;
 %template(modelAPI_ResultField) shared_ptr_cast<ModelAPI_ResultPart, ModelAPI_ResultField>;
-%template(modelAPI_ResultCompSolid) shared_ptr_cast<ModelAPI_ResultCompSolid, ModelAPI_ResultBody>;
 
 // Attribute casts
 %template(modelAPI_AttributeDocRef)        shared_ptr_cast<ModelAPI_AttributeDocRef, ModelAPI_Attribute>;