X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=gdcmPython%2Fgdcm.i;h=998702e8a04ee0174df7134b23a8a33d4a1d36a3;hb=8a359d1fc92d43422710f3694a20f141609b7982;hp=7e7f40f54154ce66cf772fe8f75c8c0102824ead;hpb=54ce6e928bccc91bb12601c782b92c833678de40;p=gdcm.git

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 7e7f40f5..998702e8 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -4,12 +4,20 @@
 #include "gdcmDictEntry.h"
 #include "gdcmDict.h"
 #include "gdcmDictSet.h"
+#include "gdcmParser.h"
 #include "gdcmHeaderEntry.h"
-#include "gdcmHeaderEntrySet.h"
 #include "gdcmHeader.h"
 #include "gdcmHeaderHelper.h"
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
+#include "gdcmObject.h"
+#include "gdcmDicomDir.h"
+#include "gdcmDicomDirElement.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,11 +106,13 @@ extern gdcmGlobal gdcmGlob;
 
 ////////////////////////////////////////////////////////////////////////////
 // Deals with function returning a C++ string.
-%typemap(out) string  {
+%typemap(out) string, std::string  {
     $result = PyString_FromString(($1).c_str());
 }
-%typemap(out) std::string  {
-    $result = PyString_FromString(($1).c_str());
+
+%typemap(python, in) const std::string, std::string
+{
+  $1 = PyString_AsString($input);
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -110,9 +120,16 @@ extern gdcmGlobal gdcmGlob;
 %include "gdcmDictEntry.h"
 %include "gdcmDict.h"
 %include "gdcmDictSet.h"
+%include "gdcmParser.h"
 %include "gdcmHeaderEntry.h"
-%include "gdcmHeaderEntrySet.h"
 %include "gdcmHeader.h"
 %include "gdcmHeaderHelper.h"
 %include "gdcmFile.h"
 %include "gdcmUtil.h"
+%include "gdcmObject.h"
+%include "gdcmDicomDir.h"
+%include "gdcmDicomDirElement.h"
+%include "gdcmPatient.h"
+%include "gdcmStudy.h"
+%include "gdcmSerie.h"
+%include "gdcmImage.h"