X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=40b0ef9bb9ae4ea456b1561866454e260ca3c489;hb=05f9a9731209a5c98895a57c6abca609f8e9b312;hp=0e21e5b84834d9ada9336592a549c9a16c5dd31c;hpb=1bc5ccd72098866fc29ca8a786e8bb6852f388ea;p=gdcm.git diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i index 0e21e5b8..40b0ef9b 100644 --- a/gdcmPython/gdcm.i +++ b/gdcmPython/gdcm.i @@ -4,8 +4,10 @@ #include "gdcmDictEntry.h" #include "gdcmDict.h" #include "gdcmDictSet.h" -#include "gdcmParser.h" -#include "gdcmHeaderEntry.h" +#include "gdcmDocEntrySet.h" +#include "gdcmSQItem.h" +#include "gdcmDocument.h" +#include "gdcmElementSet.h" #include "gdcmHeader.h" #include "gdcmHeaderHelper.h" #include "gdcmFile.h" @@ -19,12 +21,11 @@ #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirSerie.h" #include "gdcmDicomDirImage.h" - -using namespace std; +#include "gdcmValEntry.h" //////////////////////////////////////////////////////////////////////////// // Utility functions on strings for removing leading and trailing spaces -void EatLeadingAndTrailingSpaces(string & s) { +void EatLeadingAndTrailingSpaces(std::string & s) { while ( s.length() && (s[0] == ' ') ) s.erase(0,1); while ( s.length() && (s[s.length()-1] == ' ') ) @@ -49,7 +50,7 @@ void gdcmPythonVoidFunc(void *arg) { if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) { - cerr << "Caught a Ctrl-C within python, exiting program.\n"; + std::cerr << "Caught a Ctrl-C within python, exiting program.\n"; Py_Exit(1); } PyErr_Print(); @@ -69,105 +70,83 @@ void gdcmPythonVoidFuncArgDelete(void *arg) typedef unsigned short guint16; typedef unsigned int guint32; -//////////////////////////////////////////////////////////////////////////// -// Global variables get exported to cvar in Python -%immutable; -extern gdcmGlobal gdcmGlob; -%mutable; - //////////////////////////////////////////////////////////////////////////// %typemap(out) std::list * { - PyObject* NewItem = (PyObject*)0; - PyObject* NewList = PyList_New(0); // The result of this typemap - for (list::iterator NewString = ($1)->begin(); - NewString != ($1)->end(); ++NewString) { - NewItem = PyString_FromString(NewString->c_str()); - PyList_Append( NewList, NewItem); - } - $result = NewList; + PyObject* NewItem = (PyObject*)0; + PyObject* NewList = PyList_New(0); // The result of this typemap + + for (std::list::iterator NewString = ($1)->begin(); + NewString != ($1)->end(); + ++NewString) + { + NewItem = PyString_FromString(NewString->c_str()); + PyList_Append( NewList, NewItem); + } + $result = NewList; } //////////////////////////////////////////////////////////////////////////// // Convert a c++ hash table in 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 (map >::iterator tag = ($1)->begin(); - tag != ($1)->end(); ++tag) { - string first = tag->first; + 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 (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; + 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; } //////////////////////////////////////////////////////////////////////////// // Convert a c++ hash table in a python native dictionary -%typemap(out) TagHeaderEntryHT & { - PyObject* NewDict = PyDict_New(); // The result of this typemap - string RawName; // Element name as gotten from gdcm - PyObject* NewKey = (PyObject*)0; // Associated name as python object - string RawValue; // Element value as gotten from gdcm - PyObject* NewVal = (PyObject*)0; // Associated value as python object - - for (TagHeaderEntryHT::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 - RawValue = tag->second->GetValue(); - EatLeadingAndTrailingSpaces(RawValue); - NewVal = PyString_FromString(RawValue.c_str()); - - PyDict_SetItem( NewDict, NewKey, NewVal); - } - $result = NewDict; -} - -%typemap(out) TagHeaderEntryHT { - PyObject* NewDict = PyDict_New(); // The result of this typemap - string RawName; // Element name as gotten from gdcm - PyObject* NewKey = (PyObject*)0; // Associated name as python object - string RawValue; // Element value as gotten from gdcm - PyObject* NewVal = (PyObject*)0; // Associated value as python object - - for (TagHeaderEntryHT::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 - RawValue = tag->second->GetValue(); - EatLeadingAndTrailingSpaces(RawValue); - NewVal = PyString_FromString(RawValue.c_str()); - - PyDict_SetItem( NewDict, NewKey, NewVal); - } - $result = NewDict; +%typemap(out) 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 (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 + if (gdcmValEntry* ValEntryPtr = + dynamic_cast< gdcmValEntry* >(tag->second) ) + { + RawValue = ValEntryPtr->GetValue(); + } + else + continue; + EatLeadingAndTrailingSpaces(RawValue); + NewVal = PyString_FromString(RawValue.c_str()); + PyDict_SetItem( NewDict, NewKey, NewVal); + } + $result = NewDict; } //////////////////////////////////////////////////////////////////////////// @@ -175,7 +154,7 @@ extern gdcmGlobal gdcmGlob; PyObject* NewItem = (PyObject*)0; $result = PyList_New(0); // The result of this typemap - for (list::iterator New = ($1)->begin(); + for (std::list::iterator New = ($1)->begin(); New != ($1)->end(); ++New) { NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirPatient,1); PyList_Append($result, NewItem); @@ -186,7 +165,7 @@ extern gdcmGlobal gdcmGlob; PyObject* NewItem = (PyObject*)0; $result = PyList_New(0); // The result of this typemap - for (list::iterator New = ($1)->begin(); + for (std::list::iterator New = ($1)->begin(); New != ($1)->end(); ++New) { NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirStudy,1); PyList_Append($result, NewItem); @@ -197,7 +176,7 @@ extern gdcmGlobal gdcmGlob; PyObject* NewItem = (PyObject*)0; $result = PyList_New(0); // The result of this typemap - for (list::iterator New = ($1)->begin(); + for (std::list::iterator New = ($1)->begin(); New != ($1)->end(); ++New) { NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirSerie,1); PyList_Append($result, NewItem); @@ -208,7 +187,7 @@ extern gdcmGlobal gdcmGlob; PyObject* NewItem = (PyObject*)0; $result = PyList_New(0); // The result of this typemap - for (list::iterator New = ($1)->begin(); + for (std::list::iterator New = ($1)->begin(); New != ($1)->end(); ++New) { NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirImage,1); PyList_Append($result, NewItem); @@ -246,12 +225,15 @@ extern gdcmGlobal gdcmGlob; } //////////////////////////////////////////////////////////////////////////// +// Warning: Order matters ! %include "gdcmCommon.h" %include "gdcmDictEntry.h" %include "gdcmDict.h" %include "gdcmDictSet.h" -%include "gdcmParser.h" -%include "gdcmHeaderEntry.h" +%include "gdcmDocEntrySet.h" +%include "gdcmElementSet.h" +%include "gdcmDocument.h" +%include "gdcmSQItem.h" %include "gdcmHeader.h" %include "gdcmHeaderHelper.h" %include "gdcmFile.h"