Slight modification

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 7e7f40f54154ce66cf772fe8f75c8c0102824ead..0e21e5b84834d9ada9336592a549c9a16c5dd31c 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -4,14 +4,25 @@
 #include "gdcmDictEntry.h"
 #include "gdcmDict.h"
 #include "gdcmDictSet.h"
+#include "gdcmParser.h"
 #include "gdcmHeaderEntry.h"
-#include "gdcmHeaderEntrySet.h"
 #include "gdcmHeader.h"
 #include "gdcmHeaderHelper.h"
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
+#include "gdcmGlobal.h"
+#include "gdcmObject.h"
+#include "gdcmDicomDir.h"
+#include "gdcmDicomDirElement.h"
+#include "gdcmDicomDirMeta.h"
+#include "gdcmDicomDirPatient.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirImage.h"
+
 using namespace std;
 
+////////////////////////////////////////////////////////////////////////////
 // Utility functions on strings for removing leading and trailing spaces
 void EatLeadingAndTrailingSpaces(string & s) {
        while ( s.length() && (s[0] == ' ') )
@@ -19,6 +30,41 @@ void EatLeadingAndTrailingSpaces(string & s) {
        while ( s.length() && (s[s.length()-1] == ' ') )
                s.erase(s.length()-1, 1);
 }
+
+void gdcmPythonVoidFunc(void *arg)
+{
+  PyObject *arglist, *result;
+  PyObject *func = (PyObject *)arg;
+
+  arglist = Py_BuildValue("()");
+
+  result = PyEval_CallObject(func, arglist);
+  Py_DECREF(arglist);
+
+  if (result)
+    {
+    Py_XDECREF(result);
+    }
+  else
+    {
+    if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt))
+      {
+      cerr << "Caught a Ctrl-C within python, exiting program.\n";
+      Py_Exit(1);
+      }
+    PyErr_Print();
+    }
+}
+
+void gdcmPythonVoidFuncArgDelete(void *arg)
+{
+  PyObject *func = (PyObject *)arg;
+  if (func)
+    {
+    Py_DECREF(func);
+    }
+}
+
 %}
 typedef  unsigned short guint16;
 typedef  unsigned int guint32;
@@ -96,23 +142,126 @@ extern gdcmGlobal gdcmGlob;
        $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) ListDicomDirPatient & {
+       PyObject* NewItem = (PyObject*)0;
+       $result = PyList_New(0); // The result of this typemap
+
+       for (list<gdcmDicomDirPatient *>::iterator New = ($1)->begin();
+           New != ($1)->end(); ++New) {
+               NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirPatient,1);
+               PyList_Append($result, NewItem);
+       }
+}
+
+%typemap(out) ListDicomDirStudy & {
+       PyObject* NewItem = (PyObject*)0;
+       $result = PyList_New(0); // The result of this typemap
+
+       for (list<gdcmDicomDirStudy *>::iterator New = ($1)->begin();
+           New != ($1)->end(); ++New) {
+               NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirStudy,1);
+               PyList_Append($result, NewItem);
+       }
+}
+
+%typemap(out) ListDicomDirSerie & {
+       PyObject* NewItem = (PyObject*)0;
+       $result = PyList_New(0); // The result of this typemap
+
+       for (list<gdcmDicomDirSerie *>::iterator New = ($1)->begin();
+           New != ($1)->end(); ++New) {
+               NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirSerie,1);
+               PyList_Append($result, NewItem);
+       }
+}
+
+%typemap(out) ListDicomDirImage & {
+       PyObject* NewItem = (PyObject*)0;
+       $result = PyList_New(0); // The result of this typemap
+
+       for (list<gdcmDicomDirImage *>::iterator New = ($1)->begin();
+           New != ($1)->end(); ++New) {
+               NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirImage,1);
+               PyList_Append($result, NewItem);
+       }
+}
+
 ////////////////////////////////////////////////////////////////////////////
 // Deals with function returning a C++ string.
-%typemap(out) string  {
-    $result = PyString_FromString(($1).c_str());
+%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;
+       }
 }
-%typemap(out) std::string  {
+
+
+////////////////////////////////////////////////////////////////////////////
+// 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 "gdcmParser.h"
 %include "gdcmHeaderEntry.h"
-%include "gdcmHeaderEntrySet.h"
 %include "gdcmHeader.h"
 %include "gdcmHeaderHelper.h"
 %include "gdcmFile.h"
 %include "gdcmUtil.h"
+%include "gdcmGlobal.h"
+%include "gdcmObject.h"
+%include "gdcmDicomDir.h"
+%include "gdcmDicomDirElement.h"
+%include "gdcmDicomDirMeta.h"
+%include "gdcmDicomDirPatient.h"
+%include "gdcmDicomDirStudy.h"
+%include "gdcmDicomDirSerie.h"
+%include "gdcmDicomDirImage.h"