X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=22baf42cbad3d52647c4af34ae4efa76984dd79f;hb=8845fe9fca6c1ed22eaaae4dd4561c0ba2f31a6b;hp=3f68d08e7dc016692befdc50704fc9fd2987cee5;hpb=bafdfafe6c1b30607035fc4018c0405169b348e8;p=gdcm.git diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i index 3f68d08e..22baf42c 100644 --- a/gdcmPython/gdcm.i +++ b/gdcmPython/gdcm.i @@ -10,6 +10,14 @@ #include "gdcmHeaderHelper.h" #include "gdcmFile.h" #include "gdcmUtil.h" +#include "gdcmObject.h" +#include "gdcmDICOMDIR.h" +#include "gdcmPatient.h" +#include "gdcmStudy.h" +#include "gdcmSerie.h" +#include "gdcmImage.h" + + using namespace std; // Utility functions on strings for removing leading and trailing spaces @@ -98,13 +106,14 @@ extern gdcmGlobal gdcmGlob; //////////////////////////////////////////////////////////////////////////// // Deals with function returning a C++ string. -%typemap(out) string { - $result = PyString_FromString(($1).c_str()); -} -%typemap(out) std::string { +%typemap(out) string, std::string { $result = PyString_FromString(($1).c_str()); } +%typemap(python, in) const std::string, std::string +{ + $1 = PyString_AsString($input); +} //////////////////////////////////////////////////////////////////////////// %include "gdcmCommon.h" %include "gdcmDictEntry.h" @@ -116,3 +125,9 @@ extern gdcmGlobal gdcmGlob; %include "gdcmHeaderHelper.h" %include "gdcmFile.h" %include "gdcmUtil.h" +%include "gdcmObject.h" +%include "gdcmDICOMDIR.h" +%#include "gdcmPatient.h" +%include "gdcmStudy.h" +%include "gdcmSerie.h" +%include "gdcmImage.h"