doxygenation

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 8683251f709bcfaf65e9fbf65c61a3dec43b4495..998702e8a04ee0174df7134b23a8a33d4a1d36a3 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -4,12 +4,20 @@
 #include "gdcmDictEntry.h"
 #include "gdcmDict.h"
 #include "gdcmDictSet.h"
-#include "gdcmElValue.h"
-#include "gdcmElValSet.h"
-#include "gdcmUtil.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
@@ -68,14 +76,14 @@ extern gdcmGlobal gdcmGlob;
 
 ////////////////////////////////////////////////////////////////////////////
 // Convert a c++ hash table in a python native dictionary
-%typemap(out) TagElValueHT & {
+%typemap(out) TagHeaderEntryHT & {
        PyObject* NewDict = PyDict_New(); // The result of this typemap
        string RawName;                   // Element name as gotten from gdcm
        PyObject* NewKey = (PyObject*)0;  // Associated name as python object
        string RawValue;                  // Element value as gotten from gdcm
        PyObject* NewVal = (PyObject*)0;  // Associated value as python object
 
-       for (TagElValueHT::iterator tag = $1->begin(); tag != $1->end(); ++tag) {
+       for (TagHeaderEntryHT::iterator tag = $1->begin(); tag != $1->end(); ++tag) {
 
                // The element name shall be the key:
                RawName = tag->second->GetName();
@@ -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 "gdcmElValue.h"
-%include "gdcmElValSet.h"
-%include "gdcmUtil.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"