X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI.i;h=068fd4d7a2e75380e997f60ab24545b0a696f0d6;hb=1dfcab3d738e427bea678317e167c587dfbff195;hp=7c0466cdb0152f1ac71ea99f8dd0f5af10bec3b4;hpb=87b6a30a3afb8fb32e7e43ade8d9c947d9eb1684;p=modules%2Fshaper.git diff --git a/src/ModelAPI/ModelAPI.i b/src/ModelAPI/ModelAPI.i index 7c0466cdb..068fd4d7a 100644 --- a/src/ModelAPI/ModelAPI.i +++ b/src/ModelAPI/ModelAPI.i @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* ModelAPI.i */ @@ -30,10 +29,14 @@ %{ #include "ModelAPI_swig.h" + + // fix for SWIG v2.0.4 + #define SWIGPY_SLICE_ARG(obj) ((PyObject*)(obj)) %} // import other modules %import "GeomAPI.i" +%import "Events.i" // to avoid error on this #define MODELAPI_EXPORT @@ -51,6 +54,8 @@ %feature("director") ModelAPI_Feature; %feature("director") ModelAPI_CompositeFeature; %feature("director") ModelAPI_Data; +%feature("director") ModelAPI_Folder; +%feature("director") ModelAPI_Filter; // shared pointers // For ModelAPI_ResultConstruction.shape() @@ -62,6 +67,9 @@ %shared_ptr(ModelAPI_Feature) %shared_ptr(ModelAPI_CompositeFeature) %shared_ptr(ModelAPI_Data) +%shared_ptr(ModelAPI_Filter) +%shared_ptr(ModelAPI_FiltersFeature) +%shared_ptr(ModelAPI_Folder) %shared_ptr(ModelAPI_Attribute) %shared_ptr(ModelAPI_AttributeDocRef) %shared_ptr(ModelAPI_AttributeDouble) @@ -91,22 +99,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,8 +122,11 @@ } } +%apply int& OUTPUT {int& theIndexInFolder}; + // all supported interfaces %include "ModelAPI_Entity.h" +%include "ModelAPI_Events.h" %include "ModelAPI_Document.h" %include "ModelAPI_Session.h" %include "ModelAPI_Plugin.h" @@ -150,23 +161,31 @@ %include "ModelAPI_ResultField.h" %include "ModelAPI_ResultParameter.h" %include "ModelAPI_Tools.h" -%include "ModelAPI_ResultCompSolid.h" +%include "ModelAPI_Folder.h" +%include "ModelAPI_Filter.h" +%include "ModelAPI_FiltersArgs.h" +%include "ModelAPI_FiltersFactory.h" +%include "ModelAPI_FiltersFeature.h" // std::list -> [] %template(StringList) std::list; +%template(AttributeList) std::list >; %template(ObjectList) std::list >; %template(FeatureList) std::list >; %template(ResultList) std::list >; %template(DocumentList) std::list >; +%template(FilterList) std::list >; // std::set -> [] %template(AttributeSet) std::set >; %template(FeatureSet) std::set >; +%template(ObjectSet) std::set >; // std::dynamic_pointer_cast template std::shared_ptr shared_ptr_cast(std::shared_ptr theObject); %template(featureToCompositeFeature) shared_ptr_cast; %template(objectToFeature) shared_ptr_cast; %template(objectToResult) shared_ptr_cast; +%template(objectToFolder) shared_ptr_cast; %template(compositeFeatureToFeature) shared_ptr_cast; %template(modelAPI_Result) shared_ptr_cast; @@ -174,9 +193,14 @@ template std::shared_ptr shared_ptr_cast(std::shared_ptr %template(modelAPI_ResultBody) shared_ptr_cast; %template(modelAPI_ResultPart) shared_ptr_cast; %template(modelAPI_ResultParameter) shared_ptr_cast; -%template(modelAPI_ResultGroup) shared_ptr_cast; -%template(modelAPI_ResultField) shared_ptr_cast; -%template(modelAPI_ResultCompSolid) shared_ptr_cast; +%template(modelAPI_ResultGroup) shared_ptr_cast; +%template(modelAPI_ResultField) shared_ptr_cast; + +%inline %{ + ModelAPI_ObjectUpdatedMessage* messageToUpdatedMessage(std::shared_ptr msg) { + return static_cast(msg.get()); + } +%} // Attribute casts %template(modelAPI_AttributeDocRef) shared_ptr_cast; @@ -198,5 +222,5 @@ template std::shared_ptr shared_ptr_cast(std::shared_ptr %template(PointList) std::list >; %template(PointSet) std::set >; -// Geometry casts -%template(shapeToEdge) shared_ptr_cast; +template std::shared_ptr shared_ptr_cast(std::shared_ptr theObject); +%template(featureToPresentation) shared_ptr_cast;