X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=a1d6ea19ad4d633b7f23e1a76d7058b459ee0c8e;hb=1eace7fe2d9708f674da4abe0461f4bb1d734c52;hp=cb5aaeac68e414c75cb41400cceac4755156ead0;hpb=6df14b12a643a8cc3061192b22e549eed18cca73;p=gdcm.git diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i index cb5aaeac..a1d6ea19 100644 --- a/gdcmPython/gdcm.i +++ b/gdcmPython/gdcm.i @@ -1,8 +1,15 @@ %module gdcm +#pragma SWIG nowarn=504,510 %{ +#include + #include "gdcmCommon.h" #include "gdcmBase.h" +#include "gdcmRefCounter.h" +#include "gdcmTagKey.h" +#include "gdcmVRKey.h" #include "gdcmDict.h" +#include "gdcmDicomEntry.h" #include "gdcmDictEntry.h" #include "gdcmDictSet.h" #include "gdcmDicomDir.h" @@ -19,15 +26,17 @@ #include "gdcmFileHelper.h" #include "gdcmGlobal.h" #include "gdcmFile.h" -#include "gdcmSerieHeader.h" +#include "gdcmSerieHelper.h" #include "gdcmRLEFramesInfo.h" #include "gdcmJPEGFragmentsInfo.h" #include "gdcmSQItem.h" #include "gdcmUtil.h" #include "gdcmDocEntry.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" +#include "gdcmDataEntry.h" #include "gdcmSeqEntry.h" +#include "gdcmVR.h" +#include "gdcmTS.h" +#include "gdcmDictGroupName.h" //////////////////////////////////////////////////////////////////////////// /// Refer (below) to the definition of multi-argument typemap @@ -75,6 +84,17 @@ using namespace gdcm; /////////////////////// typemap section //////////////////////////////////// +//////////////////////////////////////////////// +// Redefine all types used +typedef char int8_t; +typedef unsigned char uint8_t; +typedef short int16_t; +typedef unsigned short uint16_t; +typedef int int32_t; +typedef unsigned int uint32_t; +typedef long long int64_t; +typedef unsigned long long uint64_t; + //////////////////////////////////////////////// // Convert a DocEntry * to the real derived class %typemap(out) gdcm::DocEntry * @@ -85,10 +105,10 @@ using namespace gdcm; { if(dynamic_cast($1)) // SeqEntry * newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__SeqEntry,0); - else if(dynamic_cast($1)) // BinEntry * - newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__BinEntry,0); - else // ValEntry * - newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__ValEntry,0); + else if(dynamic_cast($1)) // DataEntry * + newEntry = SWIG_NewPointerObj($1,SWIGTYPE_p_gdcm__DataEntry,0); + else + newEntry = NULL; } else { @@ -97,142 +117,6 @@ using namespace gdcm; $result = newEntry; } -//////////////////////////////////////////////// -// Convert an STL list<> to a python native list -%typemap(out) std::list * -{ - PyObject *newItem = (PyObject *)0; - PyObject *newList = PyList_New(0); // The result of this typemap - - for (std::list::iterator strIt = ($1)->begin(); - strIt != ($1)->end(); - ++strIt) - { - newItem = PyString_FromString(strIt->c_str()); - PyList_Append( newList, newItem); - } - $result = newList; -} - -////////////////////////////////////////////////////////////////// -// Convert an STL map<> (hash table) to a python native dictionary -%typemap(out) std::map > * -{ - PyObject *newDict = PyDict_New(); // The result of this typemap - PyObject *newKey = (PyObject *)0; - PyObject *newVal = (PyObject *)0; - - for (std::map >::iterator tag = ($1)->begin(); - tag != ($1)->end(); ++tag) - { - std::string first = tag->first; - // Do not publish entries whose keys is made of spaces - if (first.length() == 0) - continue; - newKey = PyString_FromString(first.c_str()); - - PyObject *newList = PyList_New(0); - for (std::list::iterator itemIt = tag->second.begin(); - itemIt != tag->second.end(); - ++itemIt) - { - newVal = PyString_FromString(itemIt->c_str()); - PyList_Append( newList, newVal); - } - PyDict_SetItem( newDict, newKey, newList); - } - $result = newDict; -} - -///////////////////////////////////////////////////////// -// Convert a c++ hash table in a python native dictionary -%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 - std::string rawValue; // Element value as gotten from gdcm - PyObject *newVal = (PyObject *)0; // Associated value as python object - - for (gdcm::TagDocEntryHT::iterator tag = $1->begin(); tag != $1->end(); ++tag) - { - // The element name shall be the key: - rawName = tag->second->GetName(); - // gdcm unrecognized (including not loaded because their size exceeds - // the user specified treshold) elements are exported with their - // TagKey as key. - if (rawName == "Unknown") - rawName = tag->second->GetKey(); - newKey = PyString_FromString(rawName.c_str()); - - // Element values are striped from leading/trailing spaces - gdcm::ValEntry *valEntryPtr = dynamic_cast< gdcm::ValEntry* >(tag->second); - if ( valEntryPtr ) - { - rawValue = valEntryPtr->GetValue(); - } - else - continue; - newVal = PyString_FromString(rawValue.c_str()); - PyDict_SetItem( newDict, newKey, newVal); - } - $result = newDict; -} - -///////////////////////////////////// -%typemap(out) ListDicomDirPatient & -{ - PyObject *newItem = (PyObject *)0; - $result = PyList_New(0); // The result of this typemap - - for (std::list::iterator newIt = ($1)->begin(); - newIt != ($1)->end(); ++newIt) - { - newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirPatient,0); - PyList_Append($result, newItem); - } -} - -%typemap(out) ListDicomDirStudy & -{ - PyObject *newItem = (PyObject *)0; - $result = PyList_New(0); // The result of this typemap - - for (std::list::iterator newIt = ($1)->begin(); - newIt != ($1)->end(); ++newIt) - { - newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirStudy,0); - PyList_Append($result, newItem); - } -} - -%typemap(out) ListDicomDirSerie & -{ - PyObject* newItem = (PyObject*)0; - $result = PyList_New(0); // The result of this typemap - - for (std::list::iterator newIt = ($1)->begin(); - newIt != ($1)->end(); ++newIt) - { - newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirSerie,0); - PyList_Append($result, newItem); - } -} - -%typemap(out) ListDicomDirImage & -{ - PyObject* newItem = (PyObject*)0; - $result = PyList_New(0); // The result of this typemap - - for (std::list::iterator newIt = ($1)->begin(); - newIt != ($1)->end(); ++newIt) - { - newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirImage,0); - PyList_Append($result, newItem); - } -} - //////////////////////////////////////////////////////////////////////////// // Multi-argument typemap designed for wrapping the progress related methods // in order to control from an external application the computation of @@ -246,9 +130,7 @@ using namespace gdcm; // 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 ) +%typemap(python, in) (void(*method)(void *),void *arg,void(*argDelete)(void *)) { if($input!=Py_None) { @@ -267,11 +149,21 @@ using namespace gdcm; //////////////////// STL string versus Python str //////////////////////// // Convertion returning a C++ string. -%typemap(out) string, std::string +%typemap(out) std::string +{ + $result = PyString_FromString(($1).c_str()); +} + +%typemap(out) string { $result = PyString_FromString(($1).c_str()); } +%typemap(out) std::string const & +{ + $result = PyString_FromString(($1)->c_str()); +} + // Convertion of incoming Python str to STL string %typemap(python, in) const std::string, std::string { @@ -285,6 +177,25 @@ using namespace gdcm; $1 = new std::string( PyString_AsString( $input ) ); } +//////////////////// gdcm.TagName versus Python str ////////////////////// +%typemap(out) gdcm::TagName, const gdcm::TagName & +{ + $result = PyString_FromString(($1)->c_str()); +} + +// Convertion of incoming Python str to STL string +%typemap(python, in) const gdcm::TagName, gdcm::TagName +{ + $1 = PyString_AsString($input); +} + +// Same convertion as above but references (since swig converts C++ +// refererences to pointers) +%typemap(python, in) gdcm::TagName const & +{ + $1 = new std::string( PyString_AsString( $input ) ); +} + //////////////////////////////////////////////////////////////////////////// // Because overloading and %rename don't work together (see below Note 1) // we need to ignore some methods (e.g. the overloaded default constructor). @@ -294,8 +205,19 @@ using namespace gdcm; %ignore gdcm::binary_write(std::ostream &,uint32_t const &); %ignore gdcm::binary_write(std::ostream &,uint16_t const &); -%ignore gdcm::File::File(); -%ignore gdcm::DicomDir::DicomDir(); +%ignore gdcm::VRKey::operator=(const VRKey &_val); +%ignore gdcm::VRKey::operator=(const std::string &_val); +%ignore gdcm::VRKey::operator=(const char *_val); +%ignore gdcm::VRKey::operator[](const unsigned int &_id) const; +%ignore gdcm::VRKey::operator[](const unsigned int &_id); + +%ignore gdcm::TagKey::operator=(const TagKey &_val); +%ignore gdcm::TagKey::operator[](const unsigned int &_id) const; +%ignore gdcm::TagKey::operator[](const unsigned int &_id); + +%ignore gdcm::DicomDir::SetStartMethod(DicomDir::Method *method,void *arg = NULL); +%ignore gdcm::DicomDir::SetProgressMethod(DicomDir::Method *method,void *arg = NULL); +%ignore gdcm::DicomDir::SetEndMethod(DicomDir::Method *method,void *arg = NULL); // Ignore all placed in gdcmCommon.h %ignore GDCM_UNKNOWN; @@ -303,16 +225,33 @@ using namespace gdcm; %ignore GDCM_BINLOADED; %ignore GDCM_NOTLOADED; %ignore GDCM_UNREAD; +%ignore GDCM_NOTASCII; +%ignore GDCM_PIXELDATA; +%ignore GDCM_LEGACY; +%ignore GDCM_VRUNKNOWN; + +%constant const char *UNKNOWN = "gdcm::Unknown"; +%constant const char *UNFOUND = "gdcm::Unfound"; +%constant const char *BINLOADED = "gdcm::Binary data loaded"; +%constant const char *NOTLOADED = "gdcm::NotLoaded"; +%constant const char *UNREAD = "gdcm::UnRead"; +%constant const char *GDCM_NOTASCII = "gdcm::NotAscii"; +%constant const char *GDCM_PIXELDATA = "gdcm::Pixel Data to be loaded"; +%constant const char *VRUNKNOWN = " "; //////////////////////////////////////////////////////////////////////////// // Warning: Order matters ! %include "gdcmCommon.h" %include "gdcmBase.h" +%include "gdcmRefCounter.h" +%include "gdcmTagKey.h" +%include "gdcmVRKey.h" +%include "gdcmDicomEntry.h" %include "gdcmDictEntry.h" %include "gdcmDict.h" +%include "gdcmDictSet.h" %include "gdcmDocEntrySet.h" %include "gdcmElementSet.h" -%include "gdcmDictSet.h" %include "gdcmSQItem.h" %include "gdcmDicomDirElement.h" %include "gdcmDicomDirObject.h" @@ -323,57 +262,14 @@ using namespace gdcm; %include "gdcmDicomDirMeta.h" %include "gdcmDocument.h" %include "gdcmFile.h" -%include "gdcmSerieHeader.h" -%include "gdcmFile.h" +%include "gdcmSerieHelper.h" +%include "gdcmFileHelper.h" %include "gdcmUtil.h" %include "gdcmGlobal.h" %include "gdcmDicomDir.h" %include "gdcmDocEntry.h" -%include "gdcmValEntry.h" -%include "gdcmBinEntry.h" +%include "gdcmDataEntry.h" %include "gdcmSeqEntry.h" - -//////////////////////////////////////////////////////////////////////////// -// Notes on swig and this file gdcm.i: -// -///////////////////////////////////// -// Note 1: swig collision of method overloading and %typemap -// Consider the following junk.i file: -// %module junk -// %{ -// #include -// #include -// void Junk(std::string const & bozo) { std::cout << bozo << std::endl; } -// void Junk() { std::cout << "Renamed Junk()" << std::endl; } -// %} -// -// %typemap(python, in) std::string const & -// { -// $1 = new std::string( PyString_AsString( $input ) ); -// } -// void Junk(); -// void Junk(std::string const & bozo); -// -// that we compile on linux with: -// swig -c++ -python junk.i -// g++ -g -I/usr/include/python2.3/ -o junk_wrap.o -c junk_wrap.cxx -// g++ junk_wrap.o -shared -g -o _junk.so -L/usr/lib/python2.3/config \ -// -lpython2.3 -// and invoque with: -// python -c 'from junk import *; Junk("aaa") ' -// then we get the following unexpected (for novice) python TypeError: -// TypeError: No matching function for overloaded 'Junk' -// -// This happens because the swig generated code (at least for python) does -// the following two stage process: -// 1/ first do a dynamic dispatch ON THE NUMBER OF ARGUMENTS of the overloaded -// Junk function (the same happens with method of course). [Note that the -// dispatch is NOT done on the type of the arguments]. -// 2/ second apply the typemap. -// When the first dynamic dispatch is executed, the swig generated code -// has no knowledge of the typemap, and thus expects a pointer to a std::string -// type i.e. an argument to Junk of the form _p_std__int
. But this -// is not what python handles to Junk ! An invocation of the form 'Junk("aaa")' -// will make Python pass a PyString to swig (and this is precisely why we -// wrote the typemap). And this will fail.... -///////////////////////////////////// +%include "gdcmVR.h" +%include "gdcmTS.h" +%include "gdcmDictGroupName.h"