diff --git a/Engine/NatronEngine/effect_wrapper.cpp b/Engine/NatronEngine/effect_wrapper.cpp index 9e87f77140..dc4a07352d 100644 --- a/Engine/NatronEngine/effect_wrapper.cpp +++ b/Engine/NatronEngine/effect_wrapper.cpp @@ -1184,7 +1184,7 @@ static PyObject* Sbk_EffectFunc_isNodeSelected(PyObject* self) return pyResult; } -static PyObject* Sbk_EffectFunc_isReaderNode(PyObject* self) +static PyObject* Sbk_EffectFunc_isOutputNode(PyObject* self) { ::Effect* cppSelf = 0; SBK_UNUSED(cppSelf) @@ -1197,8 +1197,8 @@ static PyObject* Sbk_EffectFunc_isReaderNode(PyObject* self) { if (!PyErr_Occurred()) { - // isReaderNode() - bool cppResult = cppSelf->isReaderNode(); + // isOutputNode() + bool cppResult = cppSelf->isOutputNode(); pyResult = Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppResult); } } @@ -1210,7 +1210,7 @@ static PyObject* Sbk_EffectFunc_isReaderNode(PyObject* self) return pyResult; } -static PyObject* Sbk_EffectFunc_isWriterNode(PyObject* self) +static PyObject* Sbk_EffectFunc_isReaderNode(PyObject* self) { ::Effect* cppSelf = 0; SBK_UNUSED(cppSelf) @@ -1223,8 +1223,8 @@ static PyObject* Sbk_EffectFunc_isWriterNode(PyObject* self) { if (!PyErr_Occurred()) { - // isWriterNode() - bool cppResult = cppSelf->isWriterNode(); + // isReaderNode() + bool cppResult = cppSelf->isReaderNode(); pyResult = Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppResult); } } @@ -1236,7 +1236,7 @@ static PyObject* Sbk_EffectFunc_isWriterNode(PyObject* self) return pyResult; } -static PyObject* Sbk_EffectFunc_isOutputNode(PyObject* self) +static PyObject* Sbk_EffectFunc_isWriterNode(PyObject* self) { ::Effect* cppSelf = 0; SBK_UNUSED(cppSelf) @@ -1249,8 +1249,8 @@ static PyObject* Sbk_EffectFunc_isOutputNode(PyObject* self) { if (!PyErr_Occurred()) { - // isOutputNode() - bool cppResult = cppSelf->isOutputNode(); + // isWriterNode() + bool cppResult = cppSelf->isWriterNode(); pyResult = Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppResult); } } @@ -1644,9 +1644,9 @@ static PyMethodDef Sbk_Effect_methods[] = { {"getTrackerContext", (PyCFunction)Sbk_EffectFunc_getTrackerContext, METH_NOARGS}, {"getUserPageParam", (PyCFunction)Sbk_EffectFunc_getUserPageParam, METH_NOARGS}, {"isNodeSelected", (PyCFunction)Sbk_EffectFunc_isNodeSelected, METH_NOARGS}, + {"isOutputNode", (PyCFunction)Sbk_EffectFunc_isOutputNode, METH_NOARGS}, {"isReaderNode", (PyCFunction)Sbk_EffectFunc_isReaderNode, METH_NOARGS}, {"isWriterNode", (PyCFunction)Sbk_EffectFunc_isWriterNode, METH_NOARGS}, - {"isOutputNode", (PyCFunction)Sbk_EffectFunc_isOutputNode, METH_NOARGS}, {"setColor", (PyCFunction)Sbk_EffectFunc_setColor, METH_VARARGS}, {"setLabel", (PyCFunction)Sbk_EffectFunc_setLabel, METH_O}, {"setPagesOrder", (PyCFunction)Sbk_EffectFunc_setPagesOrder, METH_O}, diff --git a/Engine/NatronEngine/natronengine_module_wrapper.cpp b/Engine/NatronEngine/natronengine_module_wrapper.cpp index 4ae0e0fa3d..680cb93470 100644 --- a/Engine/NatronEngine/natronengine_module_wrapper.cpp +++ b/Engine/NatronEngine/natronengine_module_wrapper.cpp @@ -35,6 +35,17 @@ static PyMethodDef NatronEngine_methods[] = { }; // Classes initialization functions ------------------------------------------------------------ +void init_RectD(PyObject* module); +void init_ExprUtils(PyObject* module); +void init_PyCoreApplication(PyObject* module); +void init_Group(PyObject* module); +void init_App(PyObject* module); +void init_AppSettings(PyObject* module); +void init_NodeCreationProperty(PyObject* module); +void init_StringNodeCreationProperty(PyObject* module); +void init_IntNodeCreationProperty(PyObject* module); +void init_BoolNodeCreationProperty(PyObject* module); +void init_FloatNodeCreationProperty(PyObject* module); void init_ItemBase(PyObject* module); void init_Layer(PyObject* module); void init_BezierCurve(PyObject* module); @@ -43,14 +54,15 @@ void init_Track(PyObject* module); void init_Tracker(PyObject* module); void init_ImageLayer(PyObject* module); void init_UserParamHolder(PyObject* module); +void init_Effect(PyObject* module); void init_Param(PyObject* module); +void init_GroupParam(PyObject* module); void init_AnimatedParam(PyObject* module); -void init_BooleanParam(PyObject* module); void init_StringParamBase(PyObject* module); -void init_StringParam(PyObject* module); void init_FileParam(PyObject* module); void init_OutputFileParam(PyObject* module); void init_PathParam(PyObject* module); +void init_StringParam(PyObject* module); void init_IntParam(PyObject* module); void init_Int2DParam(PyObject* module); void init_Int3DParam(PyObject* module); @@ -59,29 +71,17 @@ void init_Double2DParam(PyObject* module); void init_Double3DParam(PyObject* module); void init_ColorParam(PyObject* module); void init_ChoiceParam(PyObject* module); +void init_BooleanParam(PyObject* module); void init_PageParam(PyObject* module); void init_ButtonParam(PyObject* module); void init_ParametricParam(PyObject* module); void init_SeparatorParam(PyObject* module); -void init_GroupParam(PyObject* module); void init_Int2DTuple(PyObject* module); void init_Int3DTuple(PyObject* module); void init_Double2DTuple(PyObject* module); void init_Double3DTuple(PyObject* module); void init_ColorTuple(PyObject* module); -void init_ExprUtils(PyObject* module); -void init_PyCoreApplication(PyObject* module); -void init_Group(PyObject* module); -void init_Effect(PyObject* module); -void init_App(PyObject* module); -void init_AppSettings(PyObject* module); -void init_NodeCreationProperty(PyObject* module); -void init_IntNodeCreationProperty(PyObject* module); -void init_FloatNodeCreationProperty(PyObject* module); -void init_BoolNodeCreationProperty(PyObject* module); -void init_StringNodeCreationProperty(PyObject* module); void init_RectI(PyObject* module); -void init_RectD(PyObject* module); void init_NATRON_NAMESPACE(PyObject* module); // Required modules' type and converter arrays. @@ -150,182 +150,6 @@ static PythonToCppFunc is_std_vector_RectI__PythonToCpp_std_vector_RectI__Conver return 0; } -// C++ to Python conversion for type 'const std::vector &'. -static PyObject* conststd_vector_bool_REF_CppToPython_conststd_vector_bool_REF(const void* cppIn) { - ::std::vector& cppInRef = *((::std::vector*)cppIn); - - // TEMPLATE - stdVectorToPyList - START - ::std::vector::size_type vectorSize = cppInRef.size(); - PyObject* pyOut = PyList_New((int) vectorSize); - for (::std::vector::size_type idx = 0; idx < vectorSize; ++idx) { - bool cppItem(cppInRef[idx]); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); - } - return pyOut; - // TEMPLATE - stdVectorToPyList - END - -} -static void conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF(PyObject* pyIn, void* cppOut) { - ::std::vector& cppOutRef = *((::std::vector*)cppOut); - - // TEMPLATE - pySeqToStdVector - START - int vectorSize = PySequence_Size(pyIn); - cppOutRef.reserve(vectorSize); - for (int idx = 0; idx < vectorSize; ++idx) { - Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, idx)); - bool cppItem; - Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter(), pyItem, &(cppItem)); - cppOutRef.push_back(cppItem); - } - // TEMPLATE - pySeqToStdVector - END - -} -static PythonToCppFunc is_conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF_Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::convertibleSequenceTypes(Shiboken::Conversions::PrimitiveTypeConverter(), pyIn)) - return conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF; - return 0; -} - -// C++ to Python conversion for type 'const std::vector &'. -static PyObject* conststd_vector_int_REF_CppToPython_conststd_vector_int_REF(const void* cppIn) { - ::std::vector& cppInRef = *((::std::vector*)cppIn); - - // TEMPLATE - stdVectorToPyList - START - ::std::vector::size_type vectorSize = cppInRef.size(); - PyObject* pyOut = PyList_New((int) vectorSize); - for (::std::vector::size_type idx = 0; idx < vectorSize; ++idx) { - int cppItem(cppInRef[idx]); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); - } - return pyOut; - // TEMPLATE - stdVectorToPyList - END - -} -static void conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF(PyObject* pyIn, void* cppOut) { - ::std::vector& cppOutRef = *((::std::vector*)cppOut); - - // TEMPLATE - pySeqToStdVector - START - int vectorSize = PySequence_Size(pyIn); - cppOutRef.reserve(vectorSize); - for (int idx = 0; idx < vectorSize; ++idx) { - Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, idx)); - int cppItem; - Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter(), pyItem, &(cppItem)); - cppOutRef.push_back(cppItem); - } - // TEMPLATE - pySeqToStdVector - END - -} -static PythonToCppFunc is_conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF_Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::convertibleSequenceTypes(Shiboken::Conversions::PrimitiveTypeConverter(), pyIn)) - return conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF; - return 0; -} - -// C++ to Python conversion for type 'std::list'. -static PyObject* std_list_ParamPTR__CppToPython_std_list_ParamPTR_(const void* cppIn) { - ::std::list& cppInRef = *((::std::list*)cppIn); - - // TEMPLATE - stdListToPyList - START - PyObject* pyOut = PyList_New((int) cppInRef.size()); - ::std::list::const_iterator it = cppInRef.begin(); - for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { - ::Param* cppItem(*it); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_PARAM_IDX], cppItem)); - } - return pyOut; - // TEMPLATE - stdListToPyList - END - -} -static void std_list_ParamPTR__PythonToCpp_std_list_ParamPTR_(PyObject* pyIn, void* cppOut) { - ::std::list& cppOutRef = *((::std::list*)cppOut); - - // TEMPLATE - pyListToStdList - START - for (int i = 0; i < PySequence_Size(pyIn); i++) { - Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); - ::Param* cppItem = ((::Param*)0); - Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_PARAM_IDX], pyItem, &(cppItem)); - cppOutRef.push_back(cppItem); - } - // TEMPLATE - pyListToStdList - END - -} -static PythonToCppFunc is_std_list_ParamPTR__PythonToCpp_std_list_ParamPTR__Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::checkSequenceTypes(SbkNatronEngineTypes[SBK_PARAM_IDX], pyIn)) - return std_list_ParamPTR__PythonToCpp_std_list_ParamPTR_; - return 0; -} - -// C++ to Python conversion for type 'std::list'. -static PyObject* std_list_EffectPTR__CppToPython_std_list_EffectPTR_(const void* cppIn) { - ::std::list& cppInRef = *((::std::list*)cppIn); - - // TEMPLATE - stdListToPyList - START - PyObject* pyOut = PyList_New((int) cppInRef.size()); - ::std::list::const_iterator it = cppInRef.begin(); - for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { - ::Effect* cppItem(*it); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_EFFECT_IDX], cppItem)); - } - return pyOut; - // TEMPLATE - stdListToPyList - END - -} -static void std_list_EffectPTR__PythonToCpp_std_list_EffectPTR_(PyObject* pyIn, void* cppOut) { - ::std::list& cppOutRef = *((::std::list*)cppOut); - - // TEMPLATE - pyListToStdList - START - for (int i = 0; i < PySequence_Size(pyIn); i++) { - Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); - ::Effect* cppItem = ((::Effect*)0); - Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_EFFECT_IDX], pyItem, &(cppItem)); - cppOutRef.push_back(cppItem); - } - // TEMPLATE - pyListToStdList - END - -} -static PythonToCppFunc is_std_list_EffectPTR__PythonToCpp_std_list_EffectPTR__Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::checkSequenceTypes(SbkNatronEngineTypes[SBK_EFFECT_IDX], pyIn)) - return std_list_EffectPTR__PythonToCpp_std_list_EffectPTR_; - return 0; -} - -// C++ to Python conversion for type 'const std::vector &'. -static PyObject* conststd_vector_double_REF_CppToPython_conststd_vector_double_REF(const void* cppIn) { - ::std::vector& cppInRef = *((::std::vector*)cppIn); - - // TEMPLATE - stdVectorToPyList - START - ::std::vector::size_type vectorSize = cppInRef.size(); - PyObject* pyOut = PyList_New((int) vectorSize); - for (::std::vector::size_type idx = 0; idx < vectorSize; ++idx) { - double cppItem(cppInRef[idx]); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); - } - return pyOut; - // TEMPLATE - stdVectorToPyList - END - -} -static void conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF(PyObject* pyIn, void* cppOut) { - ::std::vector& cppOutRef = *((::std::vector*)cppOut); - - // TEMPLATE - pySeqToStdVector - START - int vectorSize = PySequence_Size(pyIn); - cppOutRef.reserve(vectorSize); - for (int idx = 0; idx < vectorSize; ++idx) { - Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, idx)); - double cppItem; - Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter(), pyItem, &(cppItem)); - cppOutRef.push_back(cppItem); - } - // TEMPLATE - pySeqToStdVector - END - -} -static PythonToCppFunc is_conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF_Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::convertibleSequenceTypes(Shiboken::Conversions::PrimitiveTypeConverter(), pyIn)) - return conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF; - return 0; -} - // C++ to Python conversion for type 'std::vector'. static PyObject* std_vector_std_string__CppToPython_std_vector_std_string_(const void* cppIn) { ::std::vector& cppInRef = *((::std::vector*)cppIn); @@ -453,114 +277,281 @@ static PythonToCppFunc is_conststd_list_std_pair_QString_QString__REF_PythonToCp return 0; } -// C++ to Python conversion for type 'const std::map &'. -static PyObject* conststd_map_QString_NodeCreationPropertyPTR_REF_CppToPython_conststd_map_QString_NodeCreationPropertyPTR_REF(const void* cppIn) { - ::std::map& cppInRef = *((::std::map*)cppIn); +// C++ to Python conversion for type 'std::list *'. +static PyObject* std_list_TrackPTR_PTR_CppToPython_std_list_TrackPTR_PTR(const void* cppIn) { + ::std::list& cppInRef = *((::std::list*)cppIn); - // TEMPLATE - stdMapToPyDict - START - PyObject* pyOut = PyDict_New(); - ::std::map::const_iterator it = cppInRef.begin(); - for (; it != cppInRef.end(); ++it) { - ::QString key = it->first; - ::NodeCreationProperty* value = it->second; - PyObject* pyKey = Shiboken::Conversions::copyToPython(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], &key); - PyObject* pyValue = Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_NODECREATIONPROPERTY_IDX], value); - PyDict_SetItem(pyOut, pyKey, pyValue); - Py_DECREF(pyKey); - Py_DECREF(pyValue); + // TEMPLATE - stdListToPyList - START + PyObject* pyOut = PyList_New((int) cppInRef.size()); + ::std::list::const_iterator it = cppInRef.begin(); + for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { + ::Track* cppItem(*it); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_TRACK_IDX], cppItem)); } return pyOut; - // TEMPLATE - stdMapToPyDict - END + // TEMPLATE - stdListToPyList - END } -static void conststd_map_QString_NodeCreationPropertyPTR_REF_PythonToCpp_conststd_map_QString_NodeCreationPropertyPTR_REF(PyObject* pyIn, void* cppOut) { - ::std::map& cppOutRef = *((::std::map*)cppOut); +static void std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR(PyObject* pyIn, void* cppOut) { + ::std::list& cppOutRef = *((::std::list*)cppOut); - // TEMPLATE - pyDictToStdMap - START - PyObject* key; - PyObject* value; - Py_ssize_t pos = 0; - while (PyDict_Next(pyIn, &pos, &key, &value)) { - ::QString cppKey = ::QString(); - Shiboken::Conversions::pythonToCppCopy(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], key, &(cppKey)); - ::NodeCreationProperty* cppValue = ((::NodeCreationProperty*)0); - Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_NODECREATIONPROPERTY_IDX], value, &(cppValue)); - cppOutRef.insert(std::make_pair(cppKey, cppValue)); + // TEMPLATE - pyListToStdList - START + for (int i = 0; i < PySequence_Size(pyIn); i++) { + Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); + ::Track* cppItem = ((::Track*)0); + Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_TRACK_IDX], pyItem, &(cppItem)); + cppOutRef.push_back(cppItem); } - // TEMPLATE - pyDictToStdMap - END + // TEMPLATE - pyListToStdList - END } -static PythonToCppFunc is_conststd_map_QString_NodeCreationPropertyPTR_REF_PythonToCpp_conststd_map_QString_NodeCreationPropertyPTR_REF_Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::convertibleDictTypes(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], false, SBK_CONVERTER(SbkNatronEngineTypes[SBK_NODECREATIONPROPERTY_IDX]), true, pyIn)) - return conststd_map_QString_NodeCreationPropertyPTR_REF_PythonToCpp_conststd_map_QString_NodeCreationPropertyPTR_REF; +static PythonToCppFunc is_std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR_Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::checkSequenceTypes(SbkNatronEngineTypes[SBK_TRACK_IDX], pyIn)) + return std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR; return 0; } -// C++ to Python conversion for type 'std::list'. -static PyObject* std_list_QString__CppToPython_std_list_QString_(const void* cppIn) { - ::std::list& cppInRef = *((::std::list*)cppIn); +// C++ to Python conversion for type 'std::list'. +static PyObject* std_list_ParamPTR__CppToPython_std_list_ParamPTR_(const void* cppIn) { + ::std::list& cppInRef = *((::std::list*)cppIn); // TEMPLATE - stdListToPyList - START PyObject* pyOut = PyList_New((int) cppInRef.size()); - ::std::list::const_iterator it = cppInRef.begin(); + ::std::list::const_iterator it = cppInRef.begin(); for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { - ::QString cppItem(*it); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], &cppItem)); + ::Param* cppItem(*it); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_PARAM_IDX], cppItem)); } return pyOut; // TEMPLATE - stdListToPyList - END } -static void std_list_QString__PythonToCpp_std_list_QString_(PyObject* pyIn, void* cppOut) { - ::std::list& cppOutRef = *((::std::list*)cppOut); +static void std_list_ParamPTR__PythonToCpp_std_list_ParamPTR_(PyObject* pyIn, void* cppOut) { + ::std::list& cppOutRef = *((::std::list*)cppOut); // TEMPLATE - pyListToStdList - START for (int i = 0; i < PySequence_Size(pyIn); i++) { Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); - ::QString cppItem = ::QString(); - Shiboken::Conversions::pythonToCppCopy(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], pyItem, &(cppItem)); + ::Param* cppItem = ((::Param*)0); + Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_PARAM_IDX], pyItem, &(cppItem)); cppOutRef.push_back(cppItem); } // TEMPLATE - pyListToStdList - END } -static PythonToCppFunc is_std_list_QString__PythonToCpp_std_list_QString__Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::convertibleSequenceTypes(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], pyIn)) - return std_list_QString__PythonToCpp_std_list_QString_; +static PythonToCppFunc is_std_list_ParamPTR__PythonToCpp_std_list_ParamPTR__Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::checkSequenceTypes(SbkNatronEngineTypes[SBK_PARAM_IDX], pyIn)) + return std_list_ParamPTR__PythonToCpp_std_list_ParamPTR_; return 0; } -// C++ to Python conversion for type 'const std::list &'. -static PyObject* conststd_list_int_REF_CppToPython_conststd_list_int_REF(const void* cppIn) { - ::std::list& cppInRef = *((::std::list*)cppIn); +// C++ to Python conversion for type 'std::list *'. +static PyObject* std_list_double_PTR_CppToPython_std_list_double_PTR(const void* cppIn) { + ::std::list& cppInRef = *((::std::list*)cppIn); // TEMPLATE - stdListToPyList - START PyObject* pyOut = PyList_New((int) cppInRef.size()); - ::std::list::const_iterator it = cppInRef.begin(); + ::std::list::const_iterator it = cppInRef.begin(); for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { - int cppItem(*it); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); + double cppItem(*it); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); } return pyOut; // TEMPLATE - stdListToPyList - END } -static void conststd_list_int_REF_PythonToCpp_conststd_list_int_REF(PyObject* pyIn, void* cppOut) { - ::std::list& cppOutRef = *((::std::list*)cppOut); +static void std_list_double_PTR_PythonToCpp_std_list_double_PTR(PyObject* pyIn, void* cppOut) { + ::std::list& cppOutRef = *((::std::list*)cppOut); + + // TEMPLATE - pyListToStdList - START + for (int i = 0; i < PySequence_Size(pyIn); i++) { + Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); + double cppItem; + Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter(), pyItem, &(cppItem)); + cppOutRef.push_back(cppItem); + } + // TEMPLATE - pyListToStdList - END + +} +static PythonToCppFunc is_std_list_double_PTR_PythonToCpp_std_list_double_PTR_Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::convertibleSequenceTypes(Shiboken::Conversions::PrimitiveTypeConverter(), pyIn)) + return std_list_double_PTR_PythonToCpp_std_list_double_PTR; + return 0; +} + +// C++ to Python conversion for type 'std::list'. +static PyObject* std_list_ItemBasePTR__CppToPython_std_list_ItemBasePTR_(const void* cppIn) { + ::std::list& cppInRef = *((::std::list*)cppIn); + + // TEMPLATE - stdListToPyList - START + PyObject* pyOut = PyList_New((int) cppInRef.size()); + ::std::list::const_iterator it = cppInRef.begin(); + for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { + ::ItemBase* cppItem(*it); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_ITEMBASE_IDX], cppItem)); + } + return pyOut; + // TEMPLATE - stdListToPyList - END + +} +static void std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR_(PyObject* pyIn, void* cppOut) { + ::std::list& cppOutRef = *((::std::list*)cppOut); // TEMPLATE - pyListToStdList - START for (int i = 0; i < PySequence_Size(pyIn); i++) { Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); + ::ItemBase* cppItem = ((::ItemBase*)0); + Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_ITEMBASE_IDX], pyItem, &(cppItem)); + cppOutRef.push_back(cppItem); + } + // TEMPLATE - pyListToStdList - END + +} +static PythonToCppFunc is_std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR__Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::checkSequenceTypes(SbkNatronEngineTypes[SBK_ITEMBASE_IDX], pyIn)) + return std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR_; + return 0; +} + +// C++ to Python conversion for type 'const std::vector &'. +static PyObject* conststd_vector_double_REF_CppToPython_conststd_vector_double_REF(const void* cppIn) { + ::std::vector& cppInRef = *((::std::vector*)cppIn); + + // TEMPLATE - stdVectorToPyList - START + ::std::vector::size_type vectorSize = cppInRef.size(); + PyObject* pyOut = PyList_New((int) vectorSize); + for (::std::vector::size_type idx = 0; idx < vectorSize; ++idx) { + double cppItem(cppInRef[idx]); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); + } + return pyOut; + // TEMPLATE - stdVectorToPyList - END + +} +static void conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF(PyObject* pyIn, void* cppOut) { + ::std::vector& cppOutRef = *((::std::vector*)cppOut); + + // TEMPLATE - pySeqToStdVector - START + int vectorSize = PySequence_Size(pyIn); + cppOutRef.reserve(vectorSize); + for (int idx = 0; idx < vectorSize; ++idx) { + Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, idx)); + double cppItem; + Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter(), pyItem, &(cppItem)); + cppOutRef.push_back(cppItem); + } + // TEMPLATE - pySeqToStdVector - END + +} +static PythonToCppFunc is_conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF_Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::convertibleSequenceTypes(Shiboken::Conversions::PrimitiveTypeConverter(), pyIn)) + return conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF; + return 0; +} + +// C++ to Python conversion for type 'const std::vector &'. +static PyObject* conststd_vector_bool_REF_CppToPython_conststd_vector_bool_REF(const void* cppIn) { + ::std::vector& cppInRef = *((::std::vector*)cppIn); + + // TEMPLATE - stdVectorToPyList - START + ::std::vector::size_type vectorSize = cppInRef.size(); + PyObject* pyOut = PyList_New((int) vectorSize); + for (::std::vector::size_type idx = 0; idx < vectorSize; ++idx) { + bool cppItem(cppInRef[idx]); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); + } + return pyOut; + // TEMPLATE - stdVectorToPyList - END + +} +static void conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF(PyObject* pyIn, void* cppOut) { + ::std::vector& cppOutRef = *((::std::vector*)cppOut); + + // TEMPLATE - pySeqToStdVector - START + int vectorSize = PySequence_Size(pyIn); + cppOutRef.reserve(vectorSize); + for (int idx = 0; idx < vectorSize; ++idx) { + Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, idx)); + bool cppItem; + Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter(), pyItem, &(cppItem)); + cppOutRef.push_back(cppItem); + } + // TEMPLATE - pySeqToStdVector - END + +} +static PythonToCppFunc is_conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF_Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::convertibleSequenceTypes(Shiboken::Conversions::PrimitiveTypeConverter(), pyIn)) + return conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF; + return 0; +} + +// C++ to Python conversion for type 'const std::vector &'. +static PyObject* conststd_vector_int_REF_CppToPython_conststd_vector_int_REF(const void* cppIn) { + ::std::vector& cppInRef = *((::std::vector*)cppIn); + + // TEMPLATE - stdVectorToPyList - START + ::std::vector::size_type vectorSize = cppInRef.size(); + PyObject* pyOut = PyList_New((int) vectorSize); + for (::std::vector::size_type idx = 0; idx < vectorSize; ++idx) { + int cppItem(cppInRef[idx]); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); + } + return pyOut; + // TEMPLATE - stdVectorToPyList - END + +} +static void conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF(PyObject* pyIn, void* cppOut) { + ::std::vector& cppOutRef = *((::std::vector*)cppOut); + + // TEMPLATE - pySeqToStdVector - START + int vectorSize = PySequence_Size(pyIn); + cppOutRef.reserve(vectorSize); + for (int idx = 0; idx < vectorSize; ++idx) { + Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, idx)); int cppItem; Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter(), pyItem, &(cppItem)); cppOutRef.push_back(cppItem); } - // TEMPLATE - pyListToStdList - END + // TEMPLATE - pySeqToStdVector - END } -static PythonToCppFunc is_conststd_list_int_REF_PythonToCpp_conststd_list_int_REF_Convertible(PyObject* pyIn) { +static PythonToCppFunc is_conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF_Convertible(PyObject* pyIn) { if (Shiboken::Conversions::convertibleSequenceTypes(Shiboken::Conversions::PrimitiveTypeConverter(), pyIn)) - return conststd_list_int_REF_PythonToCpp_conststd_list_int_REF; + return conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF; + return 0; +} + +// C++ to Python conversion for type 'std::list'. +static PyObject* std_list_EffectPTR__CppToPython_std_list_EffectPTR_(const void* cppIn) { + ::std::list& cppInRef = *((::std::list*)cppIn); + + // TEMPLATE - stdListToPyList - START + PyObject* pyOut = PyList_New((int) cppInRef.size()); + ::std::list::const_iterator it = cppInRef.begin(); + for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { + ::Effect* cppItem(*it); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_EFFECT_IDX], cppItem)); + } + return pyOut; + // TEMPLATE - stdListToPyList - END + +} +static void std_list_EffectPTR__PythonToCpp_std_list_EffectPTR_(PyObject* pyIn, void* cppOut) { + ::std::list& cppOutRef = *((::std::list*)cppOut); + + // TEMPLATE - pyListToStdList - START + for (int i = 0; i < PySequence_Size(pyIn); i++) { + Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); + ::Effect* cppItem = ((::Effect*)0); + Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_EFFECT_IDX], pyItem, &(cppItem)); + cppOutRef.push_back(cppItem); + } + // TEMPLATE - pyListToStdList - END + +} +static PythonToCppFunc is_std_list_EffectPTR__PythonToCpp_std_list_EffectPTR__Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::checkSequenceTypes(SbkNatronEngineTypes[SBK_EFFECT_IDX], pyIn)) + return std_list_EffectPTR__PythonToCpp_std_list_EffectPTR_; return 0; } @@ -598,105 +589,114 @@ static PythonToCppFunc is_std_list_ImageLayer__PythonToCpp_std_list_ImageLayer__ return 0; } -// C++ to Python conversion for type 'std::list *'. -static PyObject* std_list_TrackPTR_PTR_CppToPython_std_list_TrackPTR_PTR(const void* cppIn) { - ::std::list& cppInRef = *((::std::list*)cppIn); - - // TEMPLATE - stdListToPyList - START - PyObject* pyOut = PyList_New((int) cppInRef.size()); - ::std::list::const_iterator it = cppInRef.begin(); - for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { - ::Track* cppItem(*it); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_TRACK_IDX], cppItem)); +// C++ to Python conversion for type 'const std::map &'. +static PyObject* conststd_map_QString_NodeCreationPropertyPTR_REF_CppToPython_conststd_map_QString_NodeCreationPropertyPTR_REF(const void* cppIn) { + ::std::map& cppInRef = *((::std::map*)cppIn); + + // TEMPLATE - stdMapToPyDict - START + PyObject* pyOut = PyDict_New(); + ::std::map::const_iterator it = cppInRef.begin(); + for (; it != cppInRef.end(); ++it) { + ::QString key = it->first; + ::NodeCreationProperty* value = it->second; + PyObject* pyKey = Shiboken::Conversions::copyToPython(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], &key); + PyObject* pyValue = Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_NODECREATIONPROPERTY_IDX], value); + PyDict_SetItem(pyOut, pyKey, pyValue); + Py_DECREF(pyKey); + Py_DECREF(pyValue); } return pyOut; - // TEMPLATE - stdListToPyList - END + // TEMPLATE - stdMapToPyDict - END } -static void std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR(PyObject* pyIn, void* cppOut) { - ::std::list& cppOutRef = *((::std::list*)cppOut); +static void conststd_map_QString_NodeCreationPropertyPTR_REF_PythonToCpp_conststd_map_QString_NodeCreationPropertyPTR_REF(PyObject* pyIn, void* cppOut) { + ::std::map& cppOutRef = *((::std::map*)cppOut); - // TEMPLATE - pyListToStdList - START - for (int i = 0; i < PySequence_Size(pyIn); i++) { - Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); - ::Track* cppItem = ((::Track*)0); - Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_TRACK_IDX], pyItem, &(cppItem)); - cppOutRef.push_back(cppItem); + // TEMPLATE - pyDictToStdMap - START + PyObject* key; + PyObject* value; + Py_ssize_t pos = 0; + while (PyDict_Next(pyIn, &pos, &key, &value)) { + ::QString cppKey = ::QString(); + Shiboken::Conversions::pythonToCppCopy(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], key, &(cppKey)); + ::NodeCreationProperty* cppValue = ((::NodeCreationProperty*)0); + Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_NODECREATIONPROPERTY_IDX], value, &(cppValue)); + cppOutRef.insert(std::make_pair(cppKey, cppValue)); } - // TEMPLATE - pyListToStdList - END + // TEMPLATE - pyDictToStdMap - END } -static PythonToCppFunc is_std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR_Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::checkSequenceTypes(SbkNatronEngineTypes[SBK_TRACK_IDX], pyIn)) - return std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR; +static PythonToCppFunc is_conststd_map_QString_NodeCreationPropertyPTR_REF_PythonToCpp_conststd_map_QString_NodeCreationPropertyPTR_REF_Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::convertibleDictTypes(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], false, SBK_CONVERTER(SbkNatronEngineTypes[SBK_NODECREATIONPROPERTY_IDX]), true, pyIn)) + return conststd_map_QString_NodeCreationPropertyPTR_REF_PythonToCpp_conststd_map_QString_NodeCreationPropertyPTR_REF; return 0; } -// C++ to Python conversion for type 'std::list *'. -static PyObject* std_list_double_PTR_CppToPython_std_list_double_PTR(const void* cppIn) { - ::std::list& cppInRef = *((::std::list*)cppIn); +// C++ to Python conversion for type 'std::list'. +static PyObject* std_list_QString__CppToPython_std_list_QString_(const void* cppIn) { + ::std::list& cppInRef = *((::std::list*)cppIn); // TEMPLATE - stdListToPyList - START PyObject* pyOut = PyList_New((int) cppInRef.size()); - ::std::list::const_iterator it = cppInRef.begin(); + ::std::list::const_iterator it = cppInRef.begin(); for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { - double cppItem(*it); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); + ::QString cppItem(*it); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], &cppItem)); } return pyOut; // TEMPLATE - stdListToPyList - END } -static void std_list_double_PTR_PythonToCpp_std_list_double_PTR(PyObject* pyIn, void* cppOut) { - ::std::list& cppOutRef = *((::std::list*)cppOut); +static void std_list_QString__PythonToCpp_std_list_QString_(PyObject* pyIn, void* cppOut) { + ::std::list& cppOutRef = *((::std::list*)cppOut); // TEMPLATE - pyListToStdList - START for (int i = 0; i < PySequence_Size(pyIn); i++) { Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); - double cppItem; - Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter(), pyItem, &(cppItem)); + ::QString cppItem = ::QString(); + Shiboken::Conversions::pythonToCppCopy(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], pyItem, &(cppItem)); cppOutRef.push_back(cppItem); } // TEMPLATE - pyListToStdList - END } -static PythonToCppFunc is_std_list_double_PTR_PythonToCpp_std_list_double_PTR_Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::convertibleSequenceTypes(Shiboken::Conversions::PrimitiveTypeConverter(), pyIn)) - return std_list_double_PTR_PythonToCpp_std_list_double_PTR; +static PythonToCppFunc is_std_list_QString__PythonToCpp_std_list_QString__Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::convertibleSequenceTypes(SbkPySide_QtCoreTypeConverters[SBK_QSTRING_IDX], pyIn)) + return std_list_QString__PythonToCpp_std_list_QString_; return 0; } -// C++ to Python conversion for type 'std::list'. -static PyObject* std_list_ItemBasePTR__CppToPython_std_list_ItemBasePTR_(const void* cppIn) { - ::std::list& cppInRef = *((::std::list*)cppIn); +// C++ to Python conversion for type 'const std::list &'. +static PyObject* conststd_list_int_REF_CppToPython_conststd_list_int_REF(const void* cppIn) { + ::std::list& cppInRef = *((::std::list*)cppIn); // TEMPLATE - stdListToPyList - START PyObject* pyOut = PyList_New((int) cppInRef.size()); - ::std::list::const_iterator it = cppInRef.begin(); + ::std::list::const_iterator it = cppInRef.begin(); for (int idx = 0; it != cppInRef.end(); ++it, ++idx) { - ::ItemBase* cppItem(*it); - PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::pointerToPython((SbkObjectType*)SbkNatronEngineTypes[SBK_ITEMBASE_IDX], cppItem)); + int cppItem(*it); + PyList_SET_ITEM(pyOut, idx, Shiboken::Conversions::copyToPython(Shiboken::Conversions::PrimitiveTypeConverter(), &cppItem)); } return pyOut; // TEMPLATE - stdListToPyList - END } -static void std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR_(PyObject* pyIn, void* cppOut) { - ::std::list& cppOutRef = *((::std::list*)cppOut); +static void conststd_list_int_REF_PythonToCpp_conststd_list_int_REF(PyObject* pyIn, void* cppOut) { + ::std::list& cppOutRef = *((::std::list*)cppOut); // TEMPLATE - pyListToStdList - START for (int i = 0; i < PySequence_Size(pyIn); i++) { Shiboken::AutoDecRef pyItem(PySequence_GetItem(pyIn, i)); - ::ItemBase* cppItem = ((::ItemBase*)0); - Shiboken::Conversions::pythonToCppPointer((SbkObjectType*)SbkNatronEngineTypes[SBK_ITEMBASE_IDX], pyItem, &(cppItem)); + int cppItem; + Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter(), pyItem, &(cppItem)); cppOutRef.push_back(cppItem); } // TEMPLATE - pyListToStdList - END } -static PythonToCppFunc is_std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR__Convertible(PyObject* pyIn) { - if (Shiboken::Conversions::checkSequenceTypes(SbkNatronEngineTypes[SBK_ITEMBASE_IDX], pyIn)) - return std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR_; +static PythonToCppFunc is_conststd_list_int_REF_PythonToCpp_conststd_list_int_REF_Convertible(PyObject* pyIn) { + if (Shiboken::Conversions::convertibleSequenceTypes(Shiboken::Conversions::PrimitiveTypeConverter(), pyIn)) + return conststd_list_int_REF_PythonToCpp_conststd_list_int_REF; return 0; } @@ -858,6 +858,17 @@ SBK_MODULE_INIT_FUNCTION_BEGIN(NatronEngine) #endif // Initialize classes in the type system + init_RectD(module); + init_ExprUtils(module); + init_PyCoreApplication(module); + init_Group(module); + init_App(module); + init_AppSettings(module); + init_NodeCreationProperty(module); + init_StringNodeCreationProperty(module); + init_IntNodeCreationProperty(module); + init_BoolNodeCreationProperty(module); + init_FloatNodeCreationProperty(module); init_ItemBase(module); init_Layer(module); init_BezierCurve(module); @@ -866,14 +877,15 @@ SBK_MODULE_INIT_FUNCTION_BEGIN(NatronEngine) init_Tracker(module); init_ImageLayer(module); init_UserParamHolder(module); + init_Effect(module); init_Param(module); + init_GroupParam(module); init_AnimatedParam(module); - init_BooleanParam(module); init_StringParamBase(module); - init_StringParam(module); init_FileParam(module); init_OutputFileParam(module); init_PathParam(module); + init_StringParam(module); init_IntParam(module); init_Int2DParam(module); init_Int3DParam(module); @@ -882,29 +894,17 @@ SBK_MODULE_INIT_FUNCTION_BEGIN(NatronEngine) init_Double3DParam(module); init_ColorParam(module); init_ChoiceParam(module); + init_BooleanParam(module); init_PageParam(module); init_ButtonParam(module); init_ParametricParam(module); init_SeparatorParam(module); - init_GroupParam(module); init_Int2DTuple(module); init_Int3DTuple(module); init_Double2DTuple(module); init_Double3DTuple(module); init_ColorTuple(module); - init_ExprUtils(module); - init_PyCoreApplication(module); - init_Group(module); - init_Effect(module); - init_App(module); - init_AppSettings(module); - init_NodeCreationProperty(module); - init_IntNodeCreationProperty(module); - init_FloatNodeCreationProperty(module); - init_BoolNodeCreationProperty(module); - init_StringNodeCreationProperty(module); init_RectI(module); - init_RectD(module); init_NATRON_NAMESPACE(module); // Register converter for type 'NatronEngine.std::size_t'. @@ -923,44 +923,6 @@ SBK_MODULE_INIT_FUNCTION_BEGIN(NatronEngine) std_vector_RectI__PythonToCpp_std_vector_RectI_, is_std_vector_RectI__PythonToCpp_std_vector_RectI__Convertible); - // Register converter for type 'const std::vector&'. - SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, conststd_vector_bool_REF_CppToPython_conststd_vector_bool_REF); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX], "const std::vector&"); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX], "std::vector"); - Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX], - conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF, - is_conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF_Convertible); - - // Register converter for type 'const std::vector&'. - SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_INT_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, conststd_vector_int_REF_CppToPython_conststd_vector_int_REF); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_INT_IDX], "const std::vector&"); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_INT_IDX], "std::vector"); - Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_INT_IDX], - conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF, - is_conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF_Convertible); - - // Register converter for type 'std::list'. - SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_PARAMPTR_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_ParamPTR__CppToPython_std_list_ParamPTR_); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_PARAMPTR_IDX], "std::list"); - Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_PARAMPTR_IDX], - std_list_ParamPTR__PythonToCpp_std_list_ParamPTR_, - is_std_list_ParamPTR__PythonToCpp_std_list_ParamPTR__Convertible); - - // Register converter for type 'std::list'. - SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_EFFECTPTR_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_EffectPTR__CppToPython_std_list_EffectPTR_); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_EFFECTPTR_IDX], "std::list"); - Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_EFFECTPTR_IDX], - std_list_EffectPTR__PythonToCpp_std_list_EffectPTR_, - is_std_list_EffectPTR__PythonToCpp_std_list_EffectPTR__Convertible); - - // Register converter for type 'const std::vector&'. - SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, conststd_vector_double_REF_CppToPython_conststd_vector_double_REF); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX], "const std::vector&"); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX], "std::vector"); - Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX], - conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF, - is_conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF_Convertible); - // Register converter for type 'std::vector'. SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_STD_STRING_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_vector_std_string__CppToPython_std_vector_std_string_); Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_STD_STRING_IDX], "std::vector"); @@ -990,6 +952,72 @@ SBK_MODULE_INIT_FUNCTION_BEGIN(NatronEngine) conststd_list_std_pair_QString_QString__REF_PythonToCpp_conststd_list_std_pair_QString_QString__REF, is_conststd_list_std_pair_QString_QString__REF_PythonToCpp_conststd_list_std_pair_QString_QString__REF_Convertible); + // Register converter for type 'std::list*'. + SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_TRACKPTR_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_TrackPTR_PTR_CppToPython_std_list_TrackPTR_PTR); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_TRACKPTR_IDX], "std::list*"); + Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_TRACKPTR_IDX], + std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR, + is_std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR_Convertible); + + // Register converter for type 'std::list'. + SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_PARAMPTR_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_ParamPTR__CppToPython_std_list_ParamPTR_); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_PARAMPTR_IDX], "std::list"); + Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_PARAMPTR_IDX], + std_list_ParamPTR__PythonToCpp_std_list_ParamPTR_, + is_std_list_ParamPTR__PythonToCpp_std_list_ParamPTR__Convertible); + + // Register converter for type 'std::list*'. + SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_DOUBLE_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_double_PTR_CppToPython_std_list_double_PTR); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_DOUBLE_IDX], "std::list*"); + Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_DOUBLE_IDX], + std_list_double_PTR_PythonToCpp_std_list_double_PTR, + is_std_list_double_PTR_PythonToCpp_std_list_double_PTR_Convertible); + + // Register converter for type 'std::list'. + SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_ITEMBASEPTR_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_ItemBasePTR__CppToPython_std_list_ItemBasePTR_); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_ITEMBASEPTR_IDX], "std::list"); + Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_ITEMBASEPTR_IDX], + std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR_, + is_std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR__Convertible); + + // Register converter for type 'const std::vector&'. + SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, conststd_vector_double_REF_CppToPython_conststd_vector_double_REF); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX], "const std::vector&"); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX], "std::vector"); + Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX], + conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF, + is_conststd_vector_double_REF_PythonToCpp_conststd_vector_double_REF_Convertible); + + // Register converter for type 'const std::vector&'. + SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, conststd_vector_bool_REF_CppToPython_conststd_vector_bool_REF); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX], "const std::vector&"); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX], "std::vector"); + Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX], + conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF, + is_conststd_vector_bool_REF_PythonToCpp_conststd_vector_bool_REF_Convertible); + + // Register converter for type 'const std::vector&'. + SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_INT_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, conststd_vector_int_REF_CppToPython_conststd_vector_int_REF); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_INT_IDX], "const std::vector&"); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_INT_IDX], "std::vector"); + Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_VECTOR_INT_IDX], + conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF, + is_conststd_vector_int_REF_PythonToCpp_conststd_vector_int_REF_Convertible); + + // Register converter for type 'std::list'. + SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_EFFECTPTR_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_EffectPTR__CppToPython_std_list_EffectPTR_); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_EFFECTPTR_IDX], "std::list"); + Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_EFFECTPTR_IDX], + std_list_EffectPTR__PythonToCpp_std_list_EffectPTR_, + is_std_list_EffectPTR__PythonToCpp_std_list_EffectPTR__Convertible); + + // Register converter for type 'std::list'. + SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_IMAGELAYER_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_ImageLayer__CppToPython_std_list_ImageLayer_); + Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_IMAGELAYER_IDX], "std::list"); + Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_IMAGELAYER_IDX], + std_list_ImageLayer__PythonToCpp_std_list_ImageLayer_, + is_std_list_ImageLayer__PythonToCpp_std_list_ImageLayer__Convertible); + // Register converter for type 'const std::map&'. SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_MAP_QSTRING_NODECREATIONPROPERTYPTR_IDX] = Shiboken::Conversions::createConverter(&PyDict_Type, conststd_map_QString_NodeCreationPropertyPTR_REF_CppToPython_conststd_map_QString_NodeCreationPropertyPTR_REF); Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_MAP_QSTRING_NODECREATIONPROPERTYPTR_IDX], "const std::map&"); @@ -1013,34 +1041,6 @@ SBK_MODULE_INIT_FUNCTION_BEGIN(NatronEngine) conststd_list_int_REF_PythonToCpp_conststd_list_int_REF, is_conststd_list_int_REF_PythonToCpp_conststd_list_int_REF_Convertible); - // Register converter for type 'std::list'. - SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_IMAGELAYER_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_ImageLayer__CppToPython_std_list_ImageLayer_); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_IMAGELAYER_IDX], "std::list"); - Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_IMAGELAYER_IDX], - std_list_ImageLayer__PythonToCpp_std_list_ImageLayer_, - is_std_list_ImageLayer__PythonToCpp_std_list_ImageLayer__Convertible); - - // Register converter for type 'std::list*'. - SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_TRACKPTR_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_TrackPTR_PTR_CppToPython_std_list_TrackPTR_PTR); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_TRACKPTR_IDX], "std::list*"); - Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_TRACKPTR_IDX], - std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR, - is_std_list_TrackPTR_PTR_PythonToCpp_std_list_TrackPTR_PTR_Convertible); - - // Register converter for type 'std::list*'. - SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_DOUBLE_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_double_PTR_CppToPython_std_list_double_PTR); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_DOUBLE_IDX], "std::list*"); - Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_DOUBLE_IDX], - std_list_double_PTR_PythonToCpp_std_list_double_PTR, - is_std_list_double_PTR_PythonToCpp_std_list_double_PTR_Convertible); - - // Register converter for type 'std::list'. - SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_ITEMBASEPTR_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, std_list_ItemBasePTR__CppToPython_std_list_ItemBasePTR_); - Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_ITEMBASEPTR_IDX], "std::list"); - Shiboken::Conversions::addPythonToCppValueConversion(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_STD_LIST_ITEMBASEPTR_IDX], - std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR_, - is_std_list_ItemBasePTR__PythonToCpp_std_list_ItemBasePTR__Convertible); - // Register converter for type 'QList'. SbkNatronEngineTypeConverters[SBK_NATRONENGINE_QLIST_QVARIANT_IDX] = Shiboken::Conversions::createConverter(&PyList_Type, _QList_QVariant__CppToPython__QList_QVariant_); Shiboken::Conversions::registerConverterName(SbkNatronEngineTypeConverters[SBK_NATRONENGINE_QLIST_QVARIANT_IDX], "QList"); diff --git a/Engine/NatronEngine/natronengine_python.h b/Engine/NatronEngine/natronengine_python.h index 6feb3cb5d0..9a6664312a 100644 --- a/Engine/NatronEngine/natronengine_python.h +++ b/Engine/NatronEngine/natronengine_python.h @@ -24,8 +24,8 @@ CLANG_DIAG_ON(keyword-macro) #include #include #include -#include #include +#include #include #include #include @@ -75,31 +75,16 @@ CLANG_DIAG_ON(keyword-macro) #define SBK_NATRON_NAMESPACE_PLAYBACKMODEENUM_IDX 39 #define SBK_NATRON_NAMESPACE_DISPLAYCHANNELSENUM_IDX 32 #define SBK_NATRON_NAMESPACE_MERGINGFUNCTIONENUM_IDX 36 -#define SBK_RECTD_IDX 53 #define SBK_RECTI_IDX 54 -#define SBK_NODECREATIONPROPERTY_IDX 45 -#define SBK_BOOLNODECREATIONPROPERTY_IDX 4 -#define SBK_INTNODECREATIONPROPERTY_IDX 26 -#define SBK_APPSETTINGS_IDX 2 -#define SBK_GROUP_IDX 19 -#define SBK_PYCOREAPPLICATION_IDX 51 -#define SBK_EXPRUTILS_IDX 16 #define SBK_COLORTUPLE_IDX 9 #define SBK_DOUBLE3DTUPLE_IDX 13 #define SBK_DOUBLE2DTUPLE_IDX 11 #define SBK_INT3DTUPLE_IDX 25 #define SBK_INT2DTUPLE_IDX 23 #define SBK_PARAM_IDX 48 -#define SBK_GROUPPARAM_IDX 20 #define SBK_SEPARATORPARAM_IDX 56 #define SBK_BUTTONPARAM_IDX 6 #define SBK_ANIMATEDPARAM_IDX 0 -#define SBK_DOUBLEPARAM_IDX 14 -#define SBK_DOUBLE2DPARAM_IDX 10 -#define SBK_DOUBLE3DPARAM_IDX 12 -#define SBK_INTPARAM_IDX 27 -#define SBK_INT2DPARAM_IDX 22 -#define SBK_INT3DPARAM_IDX 24 #define SBK_STRINGPARAMBASE_IDX 60 #define SBK_PATHPARAM_IDX 50 #define SBK_OUTPUTFILEPARAM_IDX 46 @@ -109,13 +94,16 @@ CLANG_DIAG_ON(keyword-macro) #define SBK_BOOLEANPARAM_IDX 5 #define SBK_CHOICEPARAM_IDX 7 #define SBK_COLORPARAM_IDX 8 +#define SBK_DOUBLEPARAM_IDX 14 +#define SBK_DOUBLE2DPARAM_IDX 10 +#define SBK_DOUBLE3DPARAM_IDX 12 +#define SBK_INTPARAM_IDX 27 +#define SBK_INT2DPARAM_IDX 22 +#define SBK_INT3DPARAM_IDX 24 #define SBK_PARAMETRICPARAM_IDX 49 #define SBK_PAGEPARAM_IDX 47 -#define SBK_APP_IDX 1 -#define SBK_STRINGNODECREATIONPROPERTY_IDX 57 -#define SBK_FLOATNODECREATIONPROPERTY_IDX 18 +#define SBK_GROUPPARAM_IDX 20 #define SBK_USERPARAMHOLDER_IDX 63 -#define SBK_EFFECT_IDX 15 #define SBK_IMAGELAYER_IDX 21 #define SBK_TRACKER_IDX 62 #define SBK_TRACK_IDX 61 @@ -123,6 +111,18 @@ CLANG_DIAG_ON(keyword-macro) #define SBK_ITEMBASE_IDX 28 #define SBK_BEZIERCURVE_IDX 3 #define SBK_LAYER_IDX 29 +#define SBK_NODECREATIONPROPERTY_IDX 45 +#define SBK_FLOATNODECREATIONPROPERTY_IDX 18 +#define SBK_BOOLNODECREATIONPROPERTY_IDX 4 +#define SBK_INTNODECREATIONPROPERTY_IDX 26 +#define SBK_STRINGNODECREATIONPROPERTY_IDX 57 +#define SBK_APPSETTINGS_IDX 2 +#define SBK_GROUP_IDX 19 +#define SBK_EFFECT_IDX 15 +#define SBK_APP_IDX 1 +#define SBK_PYCOREAPPLICATION_IDX 51 +#define SBK_EXPRUTILS_IDX 16 +#define SBK_RECTD_IDX 53 #define SBK_NatronEngine_IDX_COUNT 64 // This variable stores all Python types exported by this module. @@ -134,22 +134,22 @@ extern SbkConverter** SbkNatronEngineTypeConverters; // Converter indices #define SBK_STD_SIZE_T_IDX 0 #define SBK_NATRONENGINE_STD_VECTOR_RECTI_IDX 1 // std::vector -#define SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX 2 // const std::vector & -#define SBK_NATRONENGINE_STD_VECTOR_INT_IDX 3 // const std::vector & -#define SBK_NATRONENGINE_STD_LIST_PARAMPTR_IDX 4 // std::list -#define SBK_NATRONENGINE_STD_LIST_EFFECTPTR_IDX 5 // std::list -#define SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX 6 // const std::vector & -#define SBK_NATRONENGINE_STD_VECTOR_STD_STRING_IDX 7 // std::vector -#define SBK_NATRONENGINE_STD_LIST_STD_VECTOR_STD_STRING_IDX 8 // std::list > * -#define SBK_NATRONENGINE_STD_PAIR_QSTRING_QSTRING_IDX 9 // std::pair -#define SBK_NATRONENGINE_STD_LIST_STD_PAIR_QSTRING_QSTRING_IDX 10 // const std::list > & -#define SBK_NATRONENGINE_STD_MAP_QSTRING_NODECREATIONPROPERTYPTR_IDX 11 // const std::map & -#define SBK_NATRONENGINE_STD_LIST_QSTRING_IDX 12 // std::list -#define SBK_NATRONENGINE_STD_LIST_INT_IDX 13 // const std::list & +#define SBK_NATRONENGINE_STD_VECTOR_STD_STRING_IDX 2 // std::vector +#define SBK_NATRONENGINE_STD_LIST_STD_VECTOR_STD_STRING_IDX 3 // std::list > * +#define SBK_NATRONENGINE_STD_PAIR_QSTRING_QSTRING_IDX 4 // std::pair +#define SBK_NATRONENGINE_STD_LIST_STD_PAIR_QSTRING_QSTRING_IDX 5 // const std::list > & +#define SBK_NATRONENGINE_STD_LIST_TRACKPTR_IDX 6 // std::list * +#define SBK_NATRONENGINE_STD_LIST_PARAMPTR_IDX 7 // std::list +#define SBK_NATRONENGINE_STD_LIST_DOUBLE_IDX 8 // std::list * +#define SBK_NATRONENGINE_STD_LIST_ITEMBASEPTR_IDX 9 // std::list +#define SBK_NATRONENGINE_STD_VECTOR_DOUBLE_IDX 10 // const std::vector & +#define SBK_NATRONENGINE_STD_VECTOR_BOOL_IDX 11 // const std::vector & +#define SBK_NATRONENGINE_STD_VECTOR_INT_IDX 12 // const std::vector & +#define SBK_NATRONENGINE_STD_LIST_EFFECTPTR_IDX 13 // std::list #define SBK_NATRONENGINE_STD_LIST_IMAGELAYER_IDX 14 // std::list -#define SBK_NATRONENGINE_STD_LIST_TRACKPTR_IDX 15 // std::list * -#define SBK_NATRONENGINE_STD_LIST_DOUBLE_IDX 16 // std::list * -#define SBK_NATRONENGINE_STD_LIST_ITEMBASEPTR_IDX 17 // std::list +#define SBK_NATRONENGINE_STD_MAP_QSTRING_NODECREATIONPROPERTYPTR_IDX 15 // const std::map & +#define SBK_NATRONENGINE_STD_LIST_QSTRING_IDX 16 // std::list +#define SBK_NATRONENGINE_STD_LIST_INT_IDX 17 // const std::list & #define SBK_NATRONENGINE_QLIST_QVARIANT_IDX 18 // QList #define SBK_NATRONENGINE_QLIST_QSTRING_IDX 19 // QList #define SBK_NATRONENGINE_QMAP_QSTRING_QVARIANT_IDX 20 // QMap @@ -176,31 +176,16 @@ template<> inline PyTypeObject* SbkType() { template<> inline PyTypeObject* SbkType() { return SbkNatronEngineTypes[SBK_NATRON_NAMESPACE_PLAYBACKMODEENUM_IDX]; } template<> inline PyTypeObject* SbkType() { return SbkNatronEngineTypes[SBK_NATRON_NAMESPACE_DISPLAYCHANNELSENUM_IDX]; } template<> inline PyTypeObject* SbkType() { return SbkNatronEngineTypes[SBK_NATRON_NAMESPACE_MERGINGFUNCTIONENUM_IDX]; } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_RECTD_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_RECTI_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_NODECREATIONPROPERTY_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_BOOLNODECREATIONPROPERTY_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INTNODECREATIONPROPERTY_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_APPSETTINGS_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_GROUP_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_PYCOREAPPLICATION_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_EXPRUTILS_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_COLORTUPLE_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_DOUBLE3DTUPLE_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_DOUBLE2DTUPLE_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INT3DTUPLE_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INT2DTUPLE_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_PARAM_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_GROUPPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_SEPARATORPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_BUTTONPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_ANIMATEDPARAM_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_DOUBLEPARAM_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_DOUBLE2DPARAM_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_DOUBLE3DPARAM_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INTPARAM_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INT2DPARAM_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INT3DPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_STRINGPARAMBASE_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_PATHPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_OUTPUTFILEPARAM_IDX]); } @@ -210,13 +195,16 @@ template<> inline PyTypeObject* SbkType inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_BOOLEANPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_CHOICEPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_COLORPARAM_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_DOUBLEPARAM_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_DOUBLE2DPARAM_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_DOUBLE3DPARAM_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INTPARAM_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INT2DPARAM_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INT3DPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_PARAMETRICPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_PAGEPARAM_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_APP_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_STRINGNODECREATIONPROPERTY_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_FLOATNODECREATIONPROPERTY_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_GROUPPARAM_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_USERPARAMHOLDER_IDX]); } -template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_EFFECT_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_IMAGELAYER_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_TRACKER_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_TRACK_IDX]); } @@ -224,6 +212,18 @@ template<> inline PyTypeObject* SbkType inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_ITEMBASE_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_BEZIERCURVE_IDX]); } template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_LAYER_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_NODECREATIONPROPERTY_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_FLOATNODECREATIONPROPERTY_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_BOOLNODECREATIONPROPERTY_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_INTNODECREATIONPROPERTY_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_STRINGNODECREATIONPROPERTY_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_APPSETTINGS_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_GROUP_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_EFFECT_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_APP_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_PYCOREAPPLICATION_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_EXPRUTILS_IDX]); } +template<> inline PyTypeObject* SbkType() { return reinterpret_cast(SbkNatronEngineTypes[SBK_RECTD_IDX]); } } // namespace Shiboken diff --git a/Gui/NatronGui/natrongui_module_wrapper.cpp b/Gui/NatronGui/natrongui_module_wrapper.cpp index 6823567781..e2d1df2407 100644 --- a/Gui/NatronGui/natrongui_module_wrapper.cpp +++ b/Gui/NatronGui/natrongui_module_wrapper.cpp @@ -39,8 +39,8 @@ void init_PyGuiApplication(PyObject* module); void init_GuiApp(PyObject* module); void init_PyViewer(PyObject* module); void init_PyTabWidget(PyObject* module); -void init_PyModalDialog(PyObject* module); void init_PyPanel(PyObject* module); +void init_PyModalDialog(PyObject* module); // Required modules' type and converter arrays. PyTypeObject** SbkPySide_QtGuiTypes; @@ -508,8 +508,8 @@ SBK_MODULE_INIT_FUNCTION_BEGIN(NatronGui) init_GuiApp(module); init_PyViewer(module); init_PyTabWidget(module); - init_PyModalDialog(module); init_PyPanel(module); + init_PyModalDialog(module); // Register converter for type 'const std::map&'. SbkNatronGuiTypeConverters[SBK_NATRONGUI_STD_MAP_QSTRING_NODECREATIONPROPERTYPTR_IDX] = Shiboken::Conversions::createConverter(&PyDict_Type, _conststd_map_QString_NodeCreationPropertyPTR_REF_CppToPython__conststd_map_QString_NodeCreationPropertyPTR_REF);