* src/gdcmDocument.cxx ftell() return properly stored in a long (i.e.

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index bed169746d689dce30f320ac7c333b205b7ae7d3..9ebe8b90510bcfcc3f04146d5fd025314ff6c1ee 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -1,26 +1,28 @@
 %module gdcm
 %{
 #include "gdcmCommon.h"
-#include "gdcmDictEntry.h"
 #include "gdcmDict.h"
+#include "gdcmDictEntry.h"
 #include "gdcmDictSet.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 "gdcmDicomDirObject.h"
 #include "gdcmDicomDir.h"
 #include "gdcmDicomDirElement.h"
+#include "gdcmDicomDirImage.h"
 #include "gdcmDicomDirMeta.h"
+#include "gdcmDicomDirObject.h"
 #include "gdcmDicomDirPatient.h"
 #include "gdcmDicomDirStudy.h"
 #include "gdcmDicomDirSerie.h"
-#include "gdcmDicomDirImage.h"
+#include "gdcmDocEntrySet.h"
+#include "gdcmDocument.h"
+#include "gdcmElementSet.h"
+#include "gdcmFile.h"
+#include "gdcmGlobal.h"
+#include "gdcmHeader.h"
+#include "gdcmHeaderHelper.h"
+#include "gdcmRLEFramesInfo.h"
+#include "gdcmJPEGFragmentsInfo.h"
+#include "gdcmSQItem.h"
+#include "gdcmUtil.h"
 #include "gdcmValEntry.h"
 
 ////////////////////////////////////////////////////////////////////////////
@@ -66,6 +68,7 @@ void gdcmPythonVoidFuncArgDelete(void *arg)
     }
 }
 
+using namespace gdcm;
 %}
 typedef  unsigned short guint16;
 typedef  unsigned int guint32;
@@ -116,14 +119,14 @@ typedef  unsigned int guint32;
 
 ////////////////////////////////////////////////////////////////////////////
 // Convert a c++ hash table in a python native dictionary
-%typemap(out) TagDocEntryHT & {
+%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 (TagDocEntryHT::iterator tag = $1->begin(); tag != $1->end(); ++tag)
+   for (gdcm::TagDocEntryHT::iterator tag = $1->begin(); tag != $1->end(); ++tag)
    {
       // The element name shall be the key:
       RawName = tag->second->GetName();
@@ -135,8 +138,8 @@ typedef  unsigned int guint32;
       NewKey = PyString_FromString(RawName.c_str());
 
       // Element values are striped from leading/trailing spaces
-      if (gdcmValEntry* ValEntryPtr =
-                dynamic_cast< gdcmValEntry* >(tag->second) )
+      if (gdcm::ValEntry* ValEntryPtr =
+                dynamic_cast< gdcm::ValEntry* >(tag->second) )
       {
          RawValue = ValEntryPtr->GetValue();
       }
@@ -154,9 +157,9 @@ typedef  unsigned int guint32;
        PyObject* NewItem = (PyObject*)0;
        $result = PyList_New(0); // The result of this typemap
 
-       for (std::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);
        }
 }
@@ -165,9 +168,9 @@ typedef  unsigned int guint32;
        PyObject* NewItem = (PyObject*)0;
        $result = PyList_New(0); // The result of this typemap
 
-       for (std::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);
        }
 }
@@ -176,9 +179,9 @@ typedef  unsigned int guint32;
        PyObject* NewItem = (PyObject*)0;
        $result = PyList_New(0); // The result of this typemap
 
-       for (std::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);
        }
 }
@@ -187,16 +190,16 @@ typedef  unsigned int guint32;
        PyObject* NewItem = (PyObject*)0;
        $result = PyList_New(0); // The result of this typemap
 
-       for (std::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);
@@ -227,23 +230,28 @@ typedef  unsigned int guint32;
 ////////////////////////////////////////////////////////////////////////////
 // Warning: Order matters !
 %include "gdcmCommon.h"
+%include "gdcmRLEFramesInfo.h"
+%include "gdcmJPEGFragmentsInfo.h"
 %include "gdcmDictEntry.h"
 %include "gdcmDict.h"
-%include "gdcmDictSet.h"
+%include "gdcmDocEntry.h"
 %include "gdcmDocEntrySet.h"
 %include "gdcmElementSet.h"
-%include "gdcmDocument.h"
+%include "gdcmDictSet.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 "gdcmGlobal.h"
-%include "gdcmDicomDirObject.h"
 %include "gdcmDicomDir.h"
-%include "gdcmDicomDirElement.h"
-%include "gdcmDicomDirMeta.h"
-%include "gdcmDicomDirPatient.h"
-%include "gdcmDicomDirStudy.h"
-%include "gdcmDicomDirSerie.h"
-%include "gdcmDicomDirImage.h"