X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=a5f9001599b4ce4e41567236dfaeec528f505a4b;hb=fcdedae1d9bed0bc794fc6d5f66310f1840e061d;hp=71b026def4a7056ae9a1a963fc3a89a3bf4fe704;hpb=a919b2ba053a046eb268658ba81ad1bb1ddcd686;p=gdcm.git

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 71b026de..a5f90015 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -10,26 +10,26 @@
 #include "gdcmHeaderHelper.h"
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
+#include "gdcmGlobal.h"
 #include "gdcmObject.h"
 #include "gdcmDicomDir.h"
 #include "gdcmDicomDirElement.h"
-#include "gdcmMeta.h"
-#include "gdcmPatient.h"
-#include "gdcmStudy.h"
-#include "gdcmSerie.h"
-#include "gdcmImage.h"
-
-using namespace std;
+#include "gdcmDicomDirMeta.h"
+#include "gdcmDicomDirPatient.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirImage.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] == ' ') )
 		s.erase(s.length()-1, 1);
 }
 
-void vtkPythonVoidFunc(void *arg)
+void gdcmPythonVoidFunc(void *arg)
 {
   PyObject *arglist, *result;
   PyObject *func = (PyObject *)arg;
@@ -47,14 +47,14 @@ void vtkPythonVoidFunc(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();
     }
 }
 
-void vtkPythonVoidFuncArgDelete(void *arg)
+void gdcmPythonVoidFuncArgDelete(void *arg)
 {
   PyObject *func = (PyObject *)arg;
   if (func)
@@ -77,7 +77,7 @@ extern gdcmGlobal gdcmGlob;
 %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();
+	for (std::list<std::string>::iterator NewString = ($1)->begin();
 	     NewString != ($1)->end(); ++NewString) {
 		NewItem = PyString_FromString(NewString->c_str());
 		PyList_Append( NewList, NewItem);
@@ -92,15 +92,15 @@ extern gdcmGlobal gdcmGlob;
 	PyObject* NewKey = (PyObject*)0;
 	PyObject* NewVal = (PyObject*)0;
 
-	for (map<string, list<string> >::iterator tag = ($1)->begin();
+	for (std::map<std::string, std::list<std::string> >::iterator tag = ($1)->begin();
 	     tag != ($1)->end(); ++tag) {
-      string first = tag->first;
+      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();
+		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);
@@ -114,9 +114,9 @@ extern gdcmGlobal gdcmGlob;
 // 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
+	std::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
+	std::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) {
@@ -142,9 +142,9 @@ extern gdcmGlobal gdcmGlob;
 
 %typemap(out) TagHeaderEntryHT {
 	PyObject* NewDict = PyDict_New(); // The result of this typemap
-	string RawName;                   // Element name as gotten from gdcm
+	std::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
+	std::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) {
@@ -169,56 +169,66 @@ extern gdcmGlobal gdcmGlob;
 }
 
 ////////////////////////////////////////////////////////////////////////////
-%typemap(out) ListPatient & {
+%typemap(out) ListDicomDirPatient & {
 	PyObject* NewItem = (PyObject*)0;
 	$result = PyList_New(0); // The result of this typemap
 
-	for (list<gdcmPatient *>::iterator New = ($1)->begin();
+	for (std::list<gdcmDicomDirPatient *>::iterator New = ($1)->begin();
 	    New != ($1)->end(); ++New) {
-		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmPatient,1);
+		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirPatient,1);
 		PyList_Append($result, NewItem);
 	}
 }
 
-%typemap(out) ListStudy & {
+%typemap(out) ListDicomDirStudy & {
 	PyObject* NewItem = (PyObject*)0;
 	$result = PyList_New(0); // The result of this typemap
 
-	for (list<gdcmStudy *>::iterator New = ($1)->begin();
+	for (std::list<gdcmDicomDirStudy *>::iterator New = ($1)->begin();
 	    New != ($1)->end(); ++New) {
-		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmStudy,1);
+		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirStudy,1);
 		PyList_Append($result, NewItem);
 	}
 }
 
-%typemap(out) ListSerie & {
+%typemap(out) ListDicomDirSerie & {
 	PyObject* NewItem = (PyObject*)0;
 	$result = PyList_New(0); // The result of this typemap
 
-	for (list<gdcmSerie *>::iterator New = ($1)->begin();
+	for (std::list<gdcmDicomDirSerie *>::iterator New = ($1)->begin();
 	    New != ($1)->end(); ++New) {
-		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmSerie,1);
+		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirSerie,1);
 		PyList_Append($result, NewItem);
 	}
 }
 
-%typemap(out) ListImage & {
+%typemap(out) ListDicomDirImage & {
 	PyObject* NewItem = (PyObject*)0;
 	$result = PyList_New(0); // The result of this typemap
 
-	for (list<gdcmImage *>::iterator New = ($1)->begin();
+	for (std::list<gdcmDicomDirImage *>::iterator New = ($1)->begin();
 	    New != ($1)->end(); ++New) {
-		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmImage,1);
+		NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirImage,1);
 		PyList_Append($result, NewItem);
 	}
 }
 
 ////////////////////////////////////////////////////////////////////////////
 // Deals with function returning a C++ string.
-%typemap(python, in) (gdcmMethod *method,void *arg) {
-    Py_INCREF($input);
-    $1=vtkPythonVoidFunc;
-	$2=$input;
+%typemap(python, in) (gdcmMethod *,void * =NULL,gdcmMethod * =NULL) {
+	if($input!=Py_None)
+	{
+		Py_INCREF($input);
+		$1=gdcmPythonVoidFunc;
+		$2=$input;
+		$3=gdcmPythonVoidFuncArgDelete;
+	}
+	else
+	{
+		$1=NULL;
+		$2=NULL;
+		$3=NULL;
+	}
 }
 
 
@@ -244,11 +254,12 @@ extern gdcmGlobal gdcmGlob;
 %include "gdcmHeaderHelper.h"
 %include "gdcmFile.h"
 %include "gdcmUtil.h"
+%include "gdcmGlobal.h"
 %include "gdcmObject.h"
 %include "gdcmDicomDir.h"
 %include "gdcmDicomDirElement.h"
-%include "gdcmMeta.h"
-%include "gdcmPatient.h"
-%include "gdcmStudy.h"
-%include "gdcmSerie.h"
-%include "gdcmImage.h"
+%include "gdcmDicomDirMeta.h"
+%include "gdcmDicomDirPatient.h"
+%include "gdcmDicomDirStudy.h"
+%include "gdcmDicomDirSerie.h"
+%include "gdcmDicomDirImage.h"