X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=8b897682b924e08515f8813ce2f337a3b52d19fd;hb=145d405e9e35d7338bd1a7a3cccfa5b84befc042;hp=169eff54b565690d241c5278621e7e9ff8f5af65;hpb=e1830579102f036e9e558320a21990a9438ec9ef;p=gdcm.git diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i index 169eff54..8b897682 100644 --- a/gdcmPython/gdcm.i +++ b/gdcmPython/gdcm.i @@ -18,7 +18,7 @@ #include "gdcmFile.h" #include "gdcmGlobal.h" #include "gdcmHeader.h" -#include "gdcmHeaderHelper.h" +#include "gdcmSerieHeader.h" #include "gdcmRLEFramesInfo.h" #include "gdcmJPEGFragmentsInfo.h" #include "gdcmSQItem.h" @@ -26,56 +26,55 @@ #include "gdcmValEntry.h" //////////////////////////////////////////////////////////////////////////// -// Utility functions on strings for removing leading and trailing spaces -void EatLeadingAndTrailingSpaces(std::string & s) { - while ( s.length() && (s[0] == ' ') ) - s.erase(0,1); - while ( s.length() && (s[s.length()-1] == ' ') ) - s.erase(s.length()-1, 1); -} - +/// Refer (below) to the definition of multi-argument typemap +/// %typemap(python, in) +/// ( gdcm::DicomDir::Method*, void*, gdcm::DicomDir::Method*) +/// for detail on gdcmPythonVoidFunc() and gdcmPythonVoidFuncArgDelete(). void gdcmPythonVoidFunc(void *arg) { - PyObject *arglist, *result; - PyObject *func = (PyObject *)arg; + PyObject *arglist, *result; + PyObject *func = (PyObject *)arg; - arglist = Py_BuildValue("()"); + arglist = Py_BuildValue("()"); - result = PyEval_CallObject(func, arglist); - Py_DECREF(arglist); + result = PyEval_CallObject(func, arglist); + Py_DECREF(arglist); - if (result) - { - Py_XDECREF(result); - } - else - { - if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) + if (result) + { + Py_XDECREF(result); + } + else + { + if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) { - std::cerr << "Caught a Ctrl-C within python, exiting program.\n"; - Py_Exit(1); + std::cerr << "Caught a Ctrl-C within python, exiting program.\n"; + Py_Exit(1); } - PyErr_Print(); - } + PyErr_Print(); + } } void gdcmPythonVoidFuncArgDelete(void *arg) { - PyObject *func = (PyObject *)arg; - if (func) - { - Py_DECREF(func); - } + PyObject *func = (PyObject *)arg; + if (func) + { + Py_DECREF(func); + } } +/// This is required in order to avoid %including all the gdcm include files. using namespace gdcm; %} -typedef unsigned short guint16; -typedef unsigned int guint32; -//////////////////////////////////////////////////////////////////////////// + +/////////////////////// typemap section //////////////////////////////////// + +//////////////////////////////////////////////// // Convert an STL list<> to a python native list -%typemap(out) std::list * { +%typemap(out) std::list * +{ PyObject* NewItem = (PyObject*)0; PyObject* NewList = PyList_New(0); // The result of this typemap @@ -89,9 +88,10 @@ typedef unsigned int guint32; $result = NewList; } -//////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////// // Convert an STL map<> (hash table) to a python native dictionary -%typemap(out) std::map > * { +%typemap(out) std::map > * +{ PyObject* NewDict = PyDict_New(); // The result of this typemap PyObject* NewKey = (PyObject*)0; PyObject* NewVal = (PyObject*)0; @@ -118,9 +118,10 @@ typedef unsigned int guint32; $result = NewDict; } -//////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////// // Convert a c++ hash table in a python native dictionary -%typemap(out) gdcm::TagDocEntryHT & { +%typemap(out) gdcm::TagDocEntryHT & +{ PyObject* NewDict = PyDict_New(); // The result of this typemap std::string RawName; // Element name as gotten from gdcm PyObject* NewKey = (PyObject*)0; // Associated name as python object @@ -146,61 +147,82 @@ typedef unsigned int guint32; } else continue; - EatLeadingAndTrailingSpaces(RawValue); NewVal = PyString_FromString(RawValue.c_str()); PyDict_SetItem( NewDict, NewKey, NewVal); } $result = NewDict; } -//////////////////////////////////////////////////////////////////////////// -%typemap(out) ListDicomDirPatient & { +///////////////////////////////////// +%typemap(out) ListDicomDirPatient & +{ PyObject* NewItem = (PyObject*)0; $result = PyList_New(0); // The result of this typemap for (std::list::iterator New = ($1)->begin(); - New != ($1)->end(); ++New) { + New != ($1)->end(); ++New) + { NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirPatient,1); PyList_Append($result, NewItem); } } -%typemap(out) ListDicomDirStudy & { +%typemap(out) ListDicomDirStudy & +{ PyObject* NewItem = (PyObject*)0; $result = PyList_New(0); // The result of this typemap for (std::list::iterator New = ($1)->begin(); - New != ($1)->end(); ++New) { + New != ($1)->end(); ++New) + { NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirStudy,1); PyList_Append($result, NewItem); } } -%typemap(out) ListDicomDirSerie & { +%typemap(out) ListDicomDirSerie & +{ PyObject* NewItem = (PyObject*)0; $result = PyList_New(0); // The result of this typemap for (std::list::iterator New = ($1)->begin(); - New != ($1)->end(); ++New) { + New != ($1)->end(); ++New) + { NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirSerie,1); PyList_Append($result, NewItem); } } -%typemap(out) ListDicomDirImage & { +%typemap(out) ListDicomDirImage & +{ PyObject* NewItem = (PyObject*)0; $result = PyList_New(0); // The result of this typemap for (std::list::iterator New = ($1)->begin(); - New != ($1)->end(); ++New) { + New != ($1)->end(); ++New) + { NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirImage,1); PyList_Append($result, NewItem); } } //////////////////////////////////////////////////////////////////////////// -// Deals with function returning a C++ string. -%typemap(python, in) (gdcm::Method *,void * =NULL,gdcm::Method * =NULL) { +// Multi-argument typemap designed for wrapping the progress related methods +// in order to control from an external application the computation of +// a DicomDir object (see DicomDir::SetStartMethod*, +// DicomDir::SetProgressMethod* and DicomDir::SetEndMethod*). +// Motivation: since DicomDir parsing can be quite long, a GUI application +// needs to display the avancement and potentially offer a +// cancel method to the user (when this one feels things are +// longer than expected). +// Example of usage: refer to demo/DicomDirProgressMethod.py +// Note: Uses gdcmPythonVoidFunc and gdcmPythonVoidFuncArgDelete defined +// in the Swig verbatim section of this gdcm.i i.e. in the above section +// enclosed within the %{ ... %} scope operator ). +%typemap(python, in) ( gdcm::DicomDir::Method *, + void * = NULL, + gdcm::DicomDir::Method * = NULL ) +{ if($input!=Py_None) { Py_INCREF($input); @@ -216,10 +238,10 @@ typedef unsigned int guint32; } } - //////////////////// STL string versus Python str //////////////////////// // Convertion returning a C++ string. -%typemap(out) string, std::string { +%typemap(out) string, std::string +{ $result = PyString_FromString(($1).c_str()); } @@ -238,25 +260,24 @@ typedef unsigned int guint32; //////////////////////////////////////////////////////////////////////////// // Because overloading and %rename don't work together (see below Note 1) -// we need to ignore the default constructor. +// we need to ignore some methods (e.g. the overloaded default constructor). // The gdcm::Header class doesn't have any SetFilename method anyhow, and // this constructor is only used internaly (not from the API) so this is // not a big loss. +%ignore gdcm::binary_write(std::ostream &,uint32_t const &); +%ignore gdcm::binary_write(std::ostream &,uint16_t const &); + %ignore gdcm::Header::Header(); +%ignore gdcm::DicomDir::DicomDir(); //////////////////////////////////////////////////////////////////////////// // Warning: Order matters ! %include "gdcmCommon.h" -%include "gdcmRLEFramesInfo.h" -%include "gdcmJPEGFragmentsInfo.h" %include "gdcmDictEntry.h" %include "gdcmDict.h" -%include "gdcmDocEntry.h" %include "gdcmDocEntrySet.h" %include "gdcmElementSet.h" %include "gdcmDictSet.h" -%include "gdcmTS.h" -%include "gdcmVR.h" %include "gdcmSQItem.h" %include "gdcmDicomDirElement.h" %include "gdcmDicomDirObject.h" @@ -267,7 +288,7 @@ typedef unsigned int guint32; %include "gdcmDicomDirMeta.h" %include "gdcmDocument.h" %include "gdcmHeader.h" -%include "gdcmHeaderHelper.h" +%include "gdcmSerieHeader.h" %include "gdcmFile.h" %include "gdcmUtil.h" %include "gdcmGlobal.h" @@ -291,7 +312,6 @@ typedef unsigned int guint32; // { // $1 = new std::string( PyString_AsString( $input ) ); // } -// add a note on the rename that works ! // void Junk(); // void Junk(std::string const & bozo); //