X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling_Swig%2FMEDCouplingTypemaps.i;h=af711aadd4885987f5a48a7e247d540c9cbab280;hb=9cc76783e6afab1acd165f8e9a24259487fe9077;hp=60c3c86af69ddb4b3a623b008cebaca292c909a6;hpb=e6712cd1e72fb8639139b69fbbe6f7091f989bcc;p=modules%2Fmed.git diff --git a/src/MEDCoupling_Swig/MEDCouplingTypemaps.i b/src/MEDCoupling_Swig/MEDCouplingTypemaps.i index 60c3c86af..af711aadd 100644 --- a/src/MEDCoupling_Swig/MEDCouplingTypemaps.i +++ b/src/MEDCoupling_Swig/MEDCouplingTypemaps.i @@ -212,13 +212,13 @@ MCData *BuildNewInstance(PyObject *elt0, int npyObjectType, PyTypeObject *pytype throw INTERP_KERNEL::Exception("Input numpy array should have dimension equal to 1 or 2 !"); if(PyArray_ObjectType(elt0,0)!=npyObjectType) { - std::ostringstream oss; oss << "Input numpy array has not of type " << msg << " at component #0 !"; + std::ostringstream oss; oss << "Input numpy array has not the type " << msg << " at component #0 !"; throw INTERP_KERNEL::Exception(oss.str().c_str()); } if(ndim==2) if(PyArray_ObjectType(elt0,1)!=npyObjectType) { - std::ostringstream oss; oss << "Input numpy array has not of type " << msg << " at component #1 !"; + std::ostringstream oss; oss << "Input numpy array has not the type " << msg << " at component #1 !"; throw INTERP_KERNEL::Exception(oss.str().c_str()); } npy_intp sz0=PyArray_DIM(elt0,0); @@ -417,6 +417,10 @@ static PyObject *convertMesh(ParaMEDMEM::MEDCouplingMesh *mesh, int owner) throw } if(dynamic_cast(mesh)) ret=SWIG_NewPointerObj((void*)mesh,SWIGTYPE_p_ParaMEDMEM__MEDCouplingUMesh,owner); + if(dynamic_cast(mesh)) + ret=SWIG_NewPointerObj((void*)mesh,SWIGTYPE_p_ParaMEDMEM__MEDCoupling1SGTUMesh,owner); + if(dynamic_cast(mesh)) + ret=SWIG_NewPointerObj((void*)mesh,SWIGTYPE_p_ParaMEDMEM__MEDCoupling1DGTUMesh,owner); if(dynamic_cast(mesh)) ret=SWIG_NewPointerObj((void*)mesh,SWIGTYPE_p_ParaMEDMEM__MEDCouplingExtrudedMesh,owner); if(dynamic_cast(mesh)) @@ -1121,7 +1125,10 @@ static void convertFromPyObjVectorOfObj(PyObject *pyLi, swig_type_info *ty, cons PyObject *obj=PyList_GetItem(pyLi,i); int status=SWIG_ConvertPtr(obj,&argp,ty,0|0); if(!SWIG_IsOK(status)) - throw INTERP_KERNEL::Exception("list must contain only MEDCouplingUMesh"); + { + std::ostringstream oss; oss << "convertFromPyObjVectorOfObj : list is excepted to contain only " << typeStr << " instances !"; + throw INTERP_KERNEL::Exception(oss.str().c_str()); + } T arg=reinterpret_cast< T >(argp); ret[i]=arg; } @@ -1136,7 +1143,7 @@ static void convertFromPyObjVectorOfObj(PyObject *pyLi, swig_type_info *ty, cons int status=SWIG_ConvertPtr(obj,&argp,ty,0|0); if(!SWIG_IsOK(status)) { - std::ostringstream oss; oss << "tuple must contain only " << typeStr; + std::ostringstream oss; oss << "convertFromPyObjVectorOfObj : tuple is excepted to contain only " << typeStr << " instances !"; throw INTERP_KERNEL::Exception(oss.str().c_str()); } T arg=reinterpret_cast< T >(argp);