X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=bb21af1be49a10ff9c3c23ef2ac41494eb30f819;hb=2e1f797ea8181180ebba6a48f0a4463bf43acedc;hp=399f6f4fbcfaf4da12cf156d3195bf2afac34965;hpb=25c9af365d9221bd45f3fbe27275ff0f66a265b1;p=gdcm.git diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i index 399f6f4f..bb21af1b 100644 --- a/gdcmPython/gdcm.i +++ b/gdcmPython/gdcm.i @@ -1,4 +1,5 @@ %module gdcm +#pragma SWIG nowarn=504 %{ #include @@ -31,6 +32,9 @@ #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 @@ -111,142 +115,6 @@ typedef unsigned long long uint64_t; $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 @@ -260,9 +128,7 @@ typedef unsigned long long uint64_t; // 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) { @@ -328,7 +194,6 @@ typedef unsigned long long uint64_t; $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). @@ -338,8 +203,9 @@ typedef unsigned long long uint64_t; %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::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; @@ -348,6 +214,12 @@ typedef unsigned long long uint64_t; %ignore GDCM_NOTLOADED; %ignore GDCM_UNREAD; +%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"; + //////////////////////////////////////////////////////////////////////////// // Warning: Order matters ! %include "gdcmCommon.h" @@ -368,7 +240,7 @@ typedef unsigned long long uint64_t; %include "gdcmDocument.h" %include "gdcmFile.h" %include "gdcmSerieHelper.h" -%include "gdcmFile.h" +%include "gdcmFileHelper.h" %include "gdcmUtil.h" %include "gdcmGlobal.h" %include "gdcmDicomDir.h" @@ -377,6 +249,9 @@ typedef unsigned long long uint64_t; %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: