X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=27a7b02a3aba323304413d54bf9755c28678f1c5;hb=933fb20f37f5f900c53c59b2a739e18303bd60d8;hp=d267799810185f76017bf22bf8271ce6e1bca3d1;hpb=c8d390d6a732aa48eeb9d831ea83f4bebc8e19f8;p=gdcm.git

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index d2677998..27a7b02a 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -4,13 +4,16 @@
 #include "gdcmDictEntry.h"
 #include "gdcmDict.h"
 #include "gdcmDictSet.h"
-#include "gdcmParser.h"
-#include "gdcmHeaderEntry.h"
+#include "gdcmDocEntrySet.h"
+#include "gdcmSQItem.h"
+#include "gdcmDocument.h"
+#include "gdcmElementSet.h"
 #include "gdcmHeader.h"
 #include "gdcmHeaderHelper.h"
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
-#include "gdcmObject.h"
+#include "gdcmGlobal.h"
+#include "gdcmDicomDirObject.h"
 #include "gdcmDicomDir.h"
 #include "gdcmDicomDirElement.h"
 #include "gdcmDicomDirMeta.h"
@@ -18,12 +21,11 @@
 #include "gdcmDicomDirStudy.h"
 #include "gdcmDicomDirSerie.h"
 #include "gdcmDicomDirImage.h"
-
-using namespace std;
+#include "gdcmValEntry.h"
 
 ////////////////////////////////////////////////////////////////////////////
 // Utility functions on strings for removing leading and trailing spaces
-void EatLeadingAndTrailingSpaces(string & s) {
+void EatLeadingAndTrailingSpaces(std::string & s) {
 	while ( s.length() && (s[0] == ' ') )
 		s.erase(0,1);
 	while ( s.length() && (s[s.length()-1] == ' ') )
@@ -48,7 +50,7 @@ void gdcmPythonVoidFunc(void *arg)
     {
     if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt))
       {
-      cerr << "Caught a Ctrl-C within python, exiting program.\n";
+      std::cerr << "Caught a Ctrl-C within python, exiting program.\n";
       Py_Exit(1);
       }
     PyErr_Print();
@@ -68,105 +70,83 @@ void gdcmPythonVoidFuncArgDelete(void *arg)
 typedef  unsigned short guint16;
 typedef  unsigned int guint32;
 
-////////////////////////////////////////////////////////////////////////////
-// 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();
-	     NewString != ($1)->end(); ++NewString) {
-		NewItem = PyString_FromString(NewString->c_str());
-		PyList_Append( NewList, NewItem);
-	}
-	$result = NewList;
+   PyObject* NewItem = (PyObject*)0;
+   PyObject* NewList = PyList_New(0); // The result of this typemap
+
+   for (std::list<std::string>::iterator NewString = ($1)->begin();
+        NewString != ($1)->end();
+        ++NewString)
+   {
+      NewItem = PyString_FromString(NewString->c_str());
+      PyList_Append( NewList, NewItem);
+   }
+   $result = NewList;
 }
 
 ////////////////////////////////////////////////////////////////////////////
 // Convert a c++ hash table in a python native dictionary
 %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;
-
-	for (map<string, list<string> >::iterator tag = ($1)->begin();
-	     tag != ($1)->end(); ++tag) {
-      string first = tag->first;
+   PyObject* NewDict = PyDict_New(); // The result of this typemap
+   PyObject* NewKey = (PyObject*)0;
+   PyObject* NewVal = (PyObject*)0;
+
+   for (std::map<std::string,
+        std::list<std::string> >::iterator tag = ($1)->begin();
+        tag != ($1)->end(); ++tag)
+   {
+      std::string first = tag->first;
       // Do not publish entries whose keys is made of spaces
       if (first.length() == 0)
          continue;
-		NewKey = PyString_FromString(first.c_str());
-		PyObject* NewList = PyList_New(0);
-		for (list<string>::iterator Item = tag->second.begin();
-		     Item != tag->second.end(); ++Item) {
-			NewVal = PyString_FromString(Item->c_str());
-			PyList_Append( NewList, NewVal);
-		}
-		PyDict_SetItem( NewDict, NewKey, NewList);
-	}
-	$result = NewDict;
+      NewKey = PyString_FromString(first.c_str());
+      PyObject* NewList = PyList_New(0);
+      for (std::list<std::string>::iterator Item = tag->second.begin();
+           Item != tag->second.end();
+           ++Item)
+      {
+         NewVal = PyString_FromString(Item->c_str());
+         PyList_Append( NewList, NewVal);
+      }
+      PyDict_SetItem( NewDict, NewKey, NewList);
+   }
+   $result = NewDict;
 }
 
 ////////////////////////////////////////////////////////////////////////////
 // Convert a c++ hash table in a python native dictionary
-%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 (TagHeaderEntryHT::iterator tag = $1->begin(); tag != $1->end(); ++tag) {
-
-		// The element name shall be the key:
-		RawName = tag->second->GetName();
-		// gdcm unrecognized (including not loaded because their size exceeds
-		// the user specified treshold) elements are exported with their
-		// TagKey as key.
-		if (RawName == "Unknown")
-			RawName = tag->second->GetKey();
-		NewKey = PyString_FromString(RawName.c_str());
-
-		// Element values are striped from leading/trailing spaces
-		RawValue = tag->second->GetValue();
-		EatLeadingAndTrailingSpaces(RawValue);
-		NewVal = PyString_FromString(RawValue.c_str());
-
-		PyDict_SetItem( NewDict, NewKey, NewVal);
-    }
-	$result = NewDict;
-}
-
-%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 (TagHeaderEntryHT::iterator tag = $1.begin(); tag != $1.end(); ++tag) {
-
-		// The element name shall be the key:
-		RawName = tag->second->GetName();
-		// gdcm unrecognized (including not loaded because their size exceeds
-		// the user specified treshold) elements are exported with their
-		// TagKey as key.
-		if (RawName == "Unknown")
-			RawName = tag->second->GetKey();
-		NewKey = PyString_FromString(RawName.c_str());
-
-		// Element values are striped from leading/trailing spaces
-		RawValue = tag->second->GetValue();
-		EatLeadingAndTrailingSpaces(RawValue);
-		NewVal = PyString_FromString(RawValue.c_str());
-
-		PyDict_SetItem( NewDict, NewKey, NewVal);
-    }
-	$result = NewDict;
+%typemap(out) gdcm::TagDocEntryHT & {
+   PyObject* NewDict = PyDict_New(); // The result of this typemap
+   std::string RawName;              // Element name as gotten from gdcm
+   PyObject* NewKey = (PyObject*)0;  // Associated name as python object
+   std::string RawValue;             // Element value as gotten from gdcm
+   PyObject* NewVal = (PyObject*)0;  // Associated value as python object
+
+   for (gdcm::TagDocEntryHT::iterator tag = $1->begin(); tag != $1->end(); ++tag)
+   {
+      // The element name shall be the key:
+      RawName = tag->second->GetName();
+      // gdcm unrecognized (including not loaded because their size exceeds
+      // the user specified treshold) elements are exported with their
+      // TagKey as key.
+      if (RawName == "Unknown")
+         RawName = tag->second->GetKey();
+      NewKey = PyString_FromString(RawName.c_str());
+
+      // Element values are striped from leading/trailing spaces
+      if (gdcm::ValEntry* ValEntryPtr =
+                dynamic_cast< gdcm::ValEntry* >(tag->second) )
+      {
+         RawValue = ValEntryPtr->GetValue();
+      }
+      else
+        continue; 
+      EatLeadingAndTrailingSpaces(RawValue);
+      NewVal = PyString_FromString(RawValue.c_str());
+      PyDict_SetItem( NewDict, NewKey, NewVal);
+   }
+   $result = NewDict;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -174,9 +154,9 @@ extern gdcmGlobal gdcmGlob;
 	PyObject* NewItem = (PyObject*)0;
 	$result = PyList_New(0); // The result of this typemap
 
-	for (list<gdcmDicomDirPatient *>::iterator New = ($1)->begin();
+	for (std::list<gdcm::DicomDirPatient *>::iterator New = ($1)->begin();
 	    New != ($1)->end(); ++New) {
-		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirPatient,1);
+		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirPatient,1);
 		PyList_Append($result, NewItem);
 	}
 }
@@ -185,9 +165,9 @@ extern gdcmGlobal gdcmGlob;
 	PyObject* NewItem = (PyObject*)0;
 	$result = PyList_New(0); // The result of this typemap
 
-	for (list<gdcmDicomDirStudy *>::iterator New = ($1)->begin();
+	for (std::list<gdcm::DicomDirStudy *>::iterator New = ($1)->begin();
 	    New != ($1)->end(); ++New) {
-		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirStudy,1);
+		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirStudy,1);
 		PyList_Append($result, NewItem);
 	}
 }
@@ -196,9 +176,9 @@ extern gdcmGlobal gdcmGlob;
 	PyObject* NewItem = (PyObject*)0;
 	$result = PyList_New(0); // The result of this typemap
 
-	for (list<gdcmDicomDirSerie *>::iterator New = ($1)->begin();
+	for (std::list<gdcm::DicomDirSerie *>::iterator New = ($1)->begin();
 	    New != ($1)->end(); ++New) {
-		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirSerie,1);
+		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirSerie,1);
 		PyList_Append($result, NewItem);
 	}
 }
@@ -207,16 +187,16 @@ extern gdcmGlobal gdcmGlob;
 	PyObject* NewItem = (PyObject*)0;
 	$result = PyList_New(0); // The result of this typemap
 
-	for (list<gdcmDicomDirImage *>::iterator New = ($1)->begin();
+	for (std::list<gdcm::DicomDirImage *>::iterator New = ($1)->begin();
 	    New != ($1)->end(); ++New) {
-		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirImage,1);
+		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_DicomDirImage,1);
 		PyList_Append($result, NewItem);
 	}
 }
 
 ////////////////////////////////////////////////////////////////////////////
 // Deals with function returning a C++ string.
-%typemap(python, in) (gdcmMethod *,void * =NULL,gdcmMethod * =NULL) {
+%typemap(python, in) (gdcm::Method *,void * =NULL,gdcm::Method * =NULL) {
 	if($input!=Py_None)
 	{
 		Py_INCREF($input);
@@ -245,21 +225,28 @@ extern gdcmGlobal gdcmGlob;
 }
 
 ////////////////////////////////////////////////////////////////////////////
+// Warning: Order matters !
 %include "gdcmCommon.h"
 %include "gdcmDictEntry.h"
 %include "gdcmDict.h"
+%include "gdcmDocEntry.h"
+%include "gdcmDocEntrySet.h"
+%include "gdcmElementSet.h"
 %include "gdcmDictSet.h"
-%include "gdcmParser.h"
-%include "gdcmHeaderEntry.h"
+%include "gdcmTS.h"
+%include "gdcmVR.h"
+%include "gdcmSQItem.h"
+%include "gdcmDicomDirElement.h"
+%include "gdcmDicomDirObject.h"
+%include "gdcmDicomDirImage.h"
+%include "gdcmDicomDirSerie.h"
+%include "gdcmDicomDirStudy.h"
+%include "gdcmDicomDirPatient.h"
+%include "gdcmDicomDirMeta.h"
+%include "gdcmDocument.h"
 %include "gdcmHeader.h"
 %include "gdcmHeaderHelper.h"
 %include "gdcmFile.h"
 %include "gdcmUtil.h"
-%include "gdcmObject.h"
+%include "gdcmGlobal.h"
 %include "gdcmDicomDir.h"
-%include "gdcmDicomDirElement.h"
-%include "gdcmDicomDirMeta.h"
-%include "gdcmDicomDirPatient.h"
-%include "gdcmDicomDirStudy.h"
-%include "gdcmDicomDirSerie.h"
-%include "gdcmDicomDirImage.h"