* gdcmHeader is now aggregating gdcmFile, and not derived into. Thus, we

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 41d5ee2080708e256e2da6137d9f51081a64ed03..69e8a82f14ec51c0ebe174b5025fe4cc18bca6e3 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -6,8 +6,10 @@
 #include "gdcmDictSet.h"
 #include "gdcmElValue.h"
 #include "gdcmElValSet.h"
+#include "gdcmUtil.h"
 #include "gdcmHeader.h"
 #include "gdcmFile.h"
+using namespace std;
 
 // Utility functions on strings for removing leading and trailing spaces
 void EatLeadingAndTrailingSpaces(string & s) {
@@ -21,7 +23,13 @@ typedef  unsigned short guint16;
 typedef  unsigned int guint32;
 
 ////////////////////////////////////////////////////////////////////////////
-%typemap(out) list<string> * {
+// Global variables get exported to cvar in Python
+%immutable;
+extern gdcmGlobal gdcmGlob;
+%mutable;
+
+////////////////////////////////////////////////////////////////////////////
+%typemap(out) std::list<std::string> * {
        PyObject* NewItem = (PyObject*)0;
        PyObject* NewList = PyList_New(0); // The result of this typemap
        for (list<string>::iterator NewString = ($1)->begin();
@@ -34,7 +42,7 @@ typedef  unsigned int guint32;
 
 ////////////////////////////////////////////////////////////////////////////
 // Convert a c++ hash table in a python native dictionary
-%typemap(out) map<string, list<string> > * {
+%typemap(out) std::map<std::string, std::list<std::string> > * {
        PyObject* NewDict = PyDict_New(); // The result of this typemap
        PyObject* NewKey = (PyObject*)0;
        PyObject* NewVal = (PyObject*)0;
@@ -92,6 +100,9 @@ typedef  unsigned int guint32;
 %typemap(out) string  {
     $result = PyString_FromString(($1).c_str());
 }
+%typemap(out) std::string  {
+    $result = PyString_FromString(($1).c_str());
+}
 
 ////////////////////////////////////////////////////////////////////////////
 %include "gdcmCommon.h"
@@ -100,6 +111,7 @@ typedef  unsigned int guint32;
 %include "gdcmDictSet.h"
 %include "gdcmElValue.h"
 %include "gdcmElValSet.h"
+%include "gdcmUtil.h"
 %include "gdcmHeader.h"
 %include "gdcmFile.h"