X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=22baf42cbad3d52647c4af34ae4efa76984dd79f;hb=3dc2328d98ad8d9e9f2b8516f8b04053e9cb9ccf;hp=f89537bbae71e750abe96fb3fa818496eb8e5825;hpb=565a47ec4e037897aaf770aeccc5d67d7ad7b478;p=gdcm.git

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index f89537bb..22baf42c 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -4,10 +4,21 @@
 #include "gdcmDictEntry.h"
 #include "gdcmDict.h"
 #include "gdcmDictSet.h"
-#include "gdcmElValue.h"
-#include "gdcmElValSet.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 "gdcmPatient.h"
+#include "gdcmStudy.h"
+#include "gdcmSerie.h"
+#include "gdcmImage.h"
+
+
+using namespace std;
 
 // Utility functions on strings for removing leading and trailing spaces
 void EatLeadingAndTrailingSpaces(string & s) {
@@ -20,7 +31,14 @@ void EatLeadingAndTrailingSpaces(string & s) {
 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();
@@ -31,8 +49,9 @@ typedef  unsigned int guint32;
 	$result = NewList;
 }
 
+////////////////////////////////////////////////////////////////////////////
 // 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;
@@ -55,15 +74,16 @@ typedef  unsigned int guint32;
 	$result = NewDict;
 }
 
+////////////////////////////////////////////////////////////////////////////
 // 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();
@@ -84,12 +104,30 @@ typedef  unsigned int guint32;
 	$result = NewDict;
 }
 
+////////////////////////////////////////////////////////////////////////////
+// Deals with function returning a C++ string.
+%typemap(out) string, std::string  {
+    $result = PyString_FromString(($1).c_str());
+}
+
+%typemap(python, in) const std::string, std::string
+{
+  $1 = PyString_AsString($input);
+}
+////////////////////////////////////////////////////////////////////////////
 %include "gdcmCommon.h"
 %include "gdcmDictEntry.h"
 %include "gdcmDict.h"
 %include "gdcmDictSet.h"
-%include "gdcmElValue.h"
-%include "gdcmElValSet.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 "gdcmPatient.h"
+%include "gdcmStudy.h"
+%include "gdcmSerie.h"
+%include "gdcmImage.h"