now gdcmFile::GetImageData loads pixels *and* updates 7fe0,0010 voidArea

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index d267799810185f76017bf22bf8271ce6e1bca3d1..9929125a975201a4732e5ede1a4f96757b3fb8ad 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -4,12 +4,15 @@
 #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 "gdcmGlobal.h"
 #include "gdcmObject.h"
 #include "gdcmDicomDir.h"
 #include "gdcmDicomDirElement.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,17 +70,11 @@ 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();
+       for (std::list<std::string>::iterator NewString = ($1)->begin();
             NewString != ($1)->end(); ++NewString) {
                NewItem = PyString_FromString(NewString->c_str());
                PyList_Append( NewList, NewItem);
@@ -93,15 +89,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);
@@ -113,14 +109,14 @@ extern gdcmGlobal gdcmGlob;
 
 ////////////////////////////////////////////////////////////////////////////
 // Convert a c++ hash table in a python native dictionary
-%typemap(out) TagHeaderEntryHT & {
+%typemap(out) TagDocEntryHT & {
        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) {
+       for (TagDocEntryHT::iterator tag = $1->begin(); tag != $1->end(); ++tag) {
 
                // The element name shall be the key:
                RawName = tag->second->GetName();
@@ -131,24 +127,33 @@ extern gdcmGlobal gdcmGlob;
                        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;
+      // Element values are striped from leading/trailing spaces
+      // Element values are striped from leading/trailing spaces
+      if (gdcmValEntry* ValEntryPtr =
+                dynamic_cast< gdcmValEntry* >(tag->second) )
+      {
+         RawValue = ValEntryPtr->GetValue();
+      }
+      else
+        continue; 
+      EatLeadingAndTrailingSpaces(RawValue);
+      NewVal = PyString_FromString(RawValue.c_str());
+
+      PyDict_SetItem( NewDict, NewKey, NewVal);
+   }
+   $result = NewDict;
 }
 
-%typemap(out) TagHeaderEntryHT {
+/*
+CLEAN ME FIXME CLEANME TODO
+%typemap(out) TagDocEntryHT {
        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) {
+       for (TagDocEntryHT::iterator tag = $1.begin(); tag != $1.end(); ++tag) {
 
                // The element name shall be the key:
                RawName = tag->second->GetName();
@@ -159,8 +164,14 @@ extern gdcmGlobal gdcmGlob;
                        RawName = tag->second->GetKey();
                NewKey = PyString_FromString(RawName.c_str());
 
-               // Element values are striped from leading/trailing spaces
-               RawValue = tag->second->GetValue();
+      // Element values are striped from leading/trailing spaces
+      if (gdcmValEntry* ValEntryPtr =
+                dynamic_cast< gdcmValEntry* >(tag->second) )
+      {
+         RawValue = ValEntryPtr->GetValue();
+      } 
+      else
+        continue;
                EatLeadingAndTrailingSpaces(RawValue);
                NewVal = PyString_FromString(RawValue.c_str());
 
@@ -168,13 +179,14 @@ extern gdcmGlobal gdcmGlob;
     }
        $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();
+       for (std::list<gdcmDicomDirPatient *>::iterator New = ($1)->begin();
            New != ($1)->end(); ++New) {
                NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirPatient,1);
                PyList_Append($result, NewItem);
@@ -185,7 +197,7 @@ 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<gdcmDicomDirStudy *>::iterator New = ($1)->begin();
            New != ($1)->end(); ++New) {
                NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirStudy,1);
                PyList_Append($result, NewItem);
@@ -196,7 +208,7 @@ 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<gdcmDicomDirSerie *>::iterator New = ($1)->begin();
            New != ($1)->end(); ++New) {
                NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirSerie,1);
                PyList_Append($result, NewItem);
@@ -207,7 +219,7 @@ 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<gdcmDicomDirImage *>::iterator New = ($1)->begin();
            New != ($1)->end(); ++New) {
                NewItem = SWIG_NewPointerObj(*New,SWIGTYPE_p_gdcmDicomDirImage,1);
                PyList_Append($result, NewItem);
@@ -245,16 +257,20 @@ extern gdcmGlobal gdcmGlob;
 }
 
 ////////////////////////////////////////////////////////////////////////////
+// Warning: Order matters !
 %include "gdcmCommon.h"
 %include "gdcmDictEntry.h"
 %include "gdcmDict.h"
 %include "gdcmDictSet.h"
-%include "gdcmParser.h"
-%include "gdcmHeaderEntry.h"
+%include "gdcmDocEntrySet.h"
+%include "gdcmElementSet.h"
+%include "gdcmDocument.h"
+%include "gdcmSQItem.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"