doxygenation

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 11b8180460fea16d2c49facd5d72318fb79ddbb6..998702e8a04ee0174df7134b23a8a33d4a1d36a3 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -4,11 +4,20 @@
 #include "gdcmDictEntry.h"
 #include "gdcmDict.h"
 #include "gdcmDictSet.h"
+#include "gdcmParser.h"
 #include "gdcmHeaderEntry.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
@@ -97,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);
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -109,8 +120,16 @@ extern gdcmGlobal gdcmGlob;
 %include "gdcmDictEntry.h"
 %include "gdcmDict.h"
 %include "gdcmDictSet.h"
+%include "gdcmParser.h"
 %include "gdcmHeaderEntry.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"