X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=6d00135ed7c99a01e555d6e2711f31b23e87003a;hb=3a9e9df62b3198c4f93d1768074b6be828ac7308;hp=2678d19f159ae31e03271fa10282f512dfb5fef9;hpb=8bec0fe5feae7564d64534eb3b4381b3a8f61e70;p=gdcm.git diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i index 2678d19f..6d00135e 100644 --- a/gdcmPython/gdcm.i +++ b/gdcmPython/gdcm.i @@ -1,5 +1,7 @@ %module gdcm %{ +#include + #include "gdcmCommon.h" #include "gdcmBase.h" #include "gdcmDict.h" @@ -16,15 +18,22 @@ #include "gdcmDocEntrySet.h" #include "gdcmDocument.h" #include "gdcmElementSet.h" -#include "gdcmFile.h" +#include "gdcmFileHelper.h" #include "gdcmGlobal.h" -#include "gdcmHeader.h" -#include "gdcmSerieHeader.h" +#include "gdcmFile.h" +#include "gdcmSerieHelper.h" #include "gdcmRLEFramesInfo.h" #include "gdcmJPEGFragmentsInfo.h" #include "gdcmSQItem.h" #include "gdcmUtil.h" +#include "gdcmDocEntry.h" +#include "gdcmContentEntry.h" #include "gdcmValEntry.h" +#include "gdcmBinEntry.h" +#include "gdcmSeqEntry.h" +#include "gdcmVR.h" +#include "gdcmTS.h" +#include "gdcmDictGroupName.h" //////////////////////////////////////////////////////////////////////////// /// Refer (below) to the definition of multi-argument typemap @@ -73,139 +82,173 @@ using namespace gdcm; /////////////////////// typemap section //////////////////////////////////// //////////////////////////////////////////////// -// Convert an STL list<> to a python native list -%typemap(out) std::list * +// 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 * { - PyObject* NewItem = (PyObject*)0; - PyObject* NewList = PyList_New(0); // The result of this typemap + PyObject *newEntry; - for (std::list::iterator NewString = ($1)->begin(); - NewString != ($1)->end(); - ++NewString) + if($1) { - NewItem = PyString_FromString(NewString->c_str()); - PyList_Append( NewList, NewItem); + 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); } - $result = NewList; + else + { + newEntry = Py_BuildValue(""); + } + $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 Item = tag->second.begin(); - Item != tag->second.end(); - ++Item) - { - NewVal = PyString_FromString(Item->c_str()); - PyList_Append( NewList, NewVal); - } - PyDict_SetItem( NewDict, NewKey, NewList); - } - $result = NewDict; -} +//%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) 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 New = ($1)->begin(); - New != ($1)->end(); ++New) - { - NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirPatient,1); - PyList_Append($result, NewItem); - } -} - -%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) - { - NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirStudy,1); - PyList_Append($result, NewItem); - } -} - -%typemap(out) ListDicomDirSerie & -{ - PyObject* NewItem = (PyObject*)0; - $result = PyList_New(0); // The result of this typemap +//%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); +// } +//} - for (std::list::iterator New = ($1)->begin(); - New != ($1)->end(); ++New) - { - NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirSerie,1); - 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) ListDicomDirImage & -{ - PyObject* NewItem = (PyObject*)0; - $result = PyList_New(0); // The result of this typemap +//%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); +// } +//} - for (std::list::iterator New = ($1)->begin(); - New != ($1)->end(); ++New) - { - NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirImage,1); - 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 @@ -241,11 +284,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 { @@ -259,27 +312,54 @@ 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). -// The gdcm::Header class doesn't have any SetFilename method anyhow, and +// The gdcm::File 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::File::File(); %ignore gdcm::DicomDir::DicomDir(); +// Ignore all placed in gdcmCommon.h +%ignore GDCM_UNKNOWN; +%ignore GDCM_UNFOUND; +%ignore GDCM_BINLOADED; +%ignore GDCM_NOTLOADED; +%ignore GDCM_UNREAD; + //////////////////////////////////////////////////////////////////////////// // Warning: Order matters ! %include "gdcmCommon.h" %include "gdcmBase.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" @@ -289,12 +369,20 @@ using namespace gdcm; %include "gdcmDicomDirPatient.h" %include "gdcmDicomDirMeta.h" %include "gdcmDocument.h" -%include "gdcmHeader.h" -%include "gdcmSerieHeader.h" +%include "gdcmFile.h" +%include "gdcmSerieHelper.h" %include "gdcmFile.h" %include "gdcmUtil.h" %include "gdcmGlobal.h" %include "gdcmDicomDir.h" +%include "gdcmDocEntry.h" +%include "gdcmContentEntry.h" +%include "gdcmValEntry.h" +%include "gdcmBinEntry.h" +%include "gdcmSeqEntry.h" +%include "gdcmVR.h" +%include "gdcmTS.h" +%include "gdcmDictGroupName.h" //////////////////////////////////////////////////////////////////////////// // Notes on swig and this file gdcm.i: