X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI.i;h=2e70d62c7bfc82de81bba0f7b1613811e14f9dbe;hb=0fdfafcdf2500a8e7e895fca953d7ebfb9126f16;hp=6fd73dedba08d1c0fc98e94f641159c4fd032477;hpb=fa502f7882cc1c782b63e936e36f061f6c7cf913;p=modules%2Fshaper.git diff --git a/src/ModelAPI/ModelAPI.i b/src/ModelAPI/ModelAPI.i index 6fd73dedb..2e70d62c7 100644 --- a/src/ModelAPI/ModelAPI.i +++ b/src/ModelAPI/ModelAPI.i @@ -1,3 +1,22 @@ +// Copyright (C) 2014-2023 CEA, EDF +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + /* ModelAPI.i */ %module(directors="1") ModelAPI %feature("director:except") { @@ -10,17 +29,27 @@ %{ #include "ModelAPI_swig.h" + + // fix for SWIG v4.1.1 + #if PY_VERSION_HEX >= 0x03020000 + # define SWIGPY_SLICEOBJECT PyObject + #else + # define SWIGPY_SLICEOBJECT PySliceObject + #endif + + // fix for SWIG v2.0.4 + #define SWIGPY_SLICE_ARG(obj) ((SWIGPY_SLICEOBJECT*)(obj)) + #define SWIGPY_UNICODE_ARG(obj) ((PyObject*) (obj)) %} // import other modules %import "GeomAPI.i" +%import "Events.i" // to avoid error on this #define MODELAPI_EXPORT // standard definitions -%include "typemaps.i" -%include "std_string.i" %include "std_list.i" %include "std_shared_ptr.i" %include "std_set.i" @@ -31,6 +60,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() @@ -42,6 +73,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) @@ -71,22 +105,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."); @@ -94,8 +128,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" @@ -130,21 +167,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; @@ -152,9 +199,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; @@ -172,3 +224,9 @@ template std::shared_ptr shared_ptr_cast(std::shared_ptr %template(modelAPI_AttributeRefList) shared_ptr_cast; %template(modelAPI_AttributeRefAttrList) shared_ptr_cast; %template(modelAPI_AttributeTables) shared_ptr_cast; + +%template(PointList) std::list >; +%template(PointSet) std::set >; + +template std::shared_ptr shared_ptr_cast(std::shared_ptr theObject); +%template(featureToPresentation) shared_ptr_cast;