X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=6d00135ed7c99a01e555d6e2711f31b23e87003a;hb=3a9e9df62b3198c4f93d1768074b6be828ac7308;hp=07d947319b093f52b8282e91888aeb5b5b79d3f6;hpb=b1ab6f0e358f0fe1894b0198c7e0b57440e13c72;p=gdcm.git

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 07d94731..6d00135e 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -21,7 +21,7 @@
 #include "gdcmFileHelper.h"
 #include "gdcmGlobal.h"
 #include "gdcmFile.h"
-#include "gdcmSerieHeader.h"
+#include "gdcmSerieHelper.h"
 #include "gdcmRLEFramesInfo.h"
 #include "gdcmJPEGFragmentsInfo.h"
 #include "gdcmSQItem.h"
@@ -31,6 +31,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
@@ -281,11 +284,21 @@ typedef unsigned long long uint64_t;
 
 ////////////////////  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
 {
@@ -357,7 +370,7 @@ typedef unsigned long long uint64_t;
 %include "gdcmDicomDirMeta.h"
 %include "gdcmDocument.h"
 %include "gdcmFile.h"
-%include "gdcmSerieHeader.h"
+%include "gdcmSerieHelper.h"
 %include "gdcmFile.h"
 %include "gdcmUtil.h"
 %include "gdcmGlobal.h"
@@ -367,6 +380,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: