X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fgdcm.i;h=a7fa9553bb5f058b3b7094c35c384b5e1a2cc302;hb=a7db02bef6a7ac565b50cab8fbda9f04f3dfe07a;hp=6d00135ed7c99a01e555d6e2711f31b23e87003a;hpb=3a9e9df62b3198c4f93d1768074b6be828ac7308;p=gdcm.git

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 6d00135e..a7fa9553 100644
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -114,142 +114,6 @@ typedef unsigned long long uint64_t;
    $result = newEntry;
 }
 
-////////////////////////////////////////////////
-// Convert an STL list<> to a python native list
-//%typemap(out) std::list<std::string> * 
-//{
-//   PyObject *newItem = (PyObject *)0;
-//   PyObject *newList = PyList_New(0); // The result of this typemap
-//
-//   for (std::list<std::string>::iterator strIt = ($1)->begin();
-//        strIt != ($1)->end();
-//        ++strIt)
-//   {
-//      newItem = PyString_FromString(strIt->c_str());
-//      PyList_Append( newList, newItem);
-//   }
-//   $result = newList;
-//}
-
-//////////////////////////////////////////////////////////////////
-// Convert an STL map<> (hash table) to 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 (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 (std::list<std::string>::iterator itemIt = tag->second.begin();
-//           itemIt != tag->second.end();
-//           ++itemIt)
-//      {
-//         newVal = PyString_FromString(itemIt->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) 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
-//      gdcm::ValEntry *valEntryPtr = dynamic_cast< gdcm::ValEntry* >(tag->second);
-//      if ( valEntryPtr )
-//      {
-//         rawValue = valEntryPtr->GetValue();
-//      }
-//      else
-//        continue; 
-//      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 (std::list<gdcm::DicomDirPatient *>::iterator newIt = ($1)->begin();
-//	    newIt != ($1)->end(); ++newIt)
-//   {
-//		newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirPatient,0);
-//		PyList_Append($result, newItem);
-//	}
-//}
-
-//%typemap(out) ListDicomDirStudy & 
-//{
-//	PyObject *newItem = (PyObject *)0;
-//	$result = PyList_New(0); // The result of this typemap
-//
-//	for (std::list<gdcm::DicomDirStudy *>::iterator newIt = ($1)->begin();
-//	    newIt != ($1)->end(); ++newIt)
-//   {
-//		newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirStudy,0);
-//		PyList_Append($result, newItem);
-//	}
-//}
-
-//%typemap(out) ListDicomDirSerie & 
-//{
-//	PyObject* newItem = (PyObject*)0;
-//	$result = PyList_New(0); // The result of this typemap
-//
-//	for (std::list<gdcm::DicomDirSerie *>::iterator newIt = ($1)->begin();
-//	    newIt != ($1)->end(); ++newIt)
-//   {
-//		newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirSerie,0);
-//		PyList_Append($result, newItem);
-//	}
-//}
-
-//%typemap(out) ListDicomDirImage & 
-//{
-//	PyObject* newItem = (PyObject*)0;
-//	$result = PyList_New(0); // The result of this typemap
-//
-//	for (std::list<gdcm::DicomDirImage *>::iterator newIt = ($1)->begin();
-//	    newIt != ($1)->end(); ++newIt) 
-//   {
-//		newItem = SWIG_NewPointerObj(*newIt,SWIGTYPE_p_DicomDirImage,0);
-//		PyList_Append($result, newItem);
-//	}
-//}
-
 ////////////////////////////////////////////////////////////////////////////
 // Multi-argument typemap designed for wrapping the progress related methods
 // in order to control from an external application the computation of
@@ -331,7 +195,6 @@ typedef unsigned long long uint64_t;
    $1 = new std::string( PyString_AsString( $input ) );
 }
 
-
 ////////////////////////////////////////////////////////////////////////////
 // Because overloading and %rename don't work together (see below Note 1)
 // we need to ignore some methods (e.g. the overloaded default constructor).
@@ -351,6 +214,12 @@ typedef unsigned long long uint64_t;
 %ignore GDCM_NOTLOADED;
 %ignore GDCM_UNREAD;
 
+%constant const char *UNKNOWN   = "gdcm::Unknown";
+%constant const char *UNFOUND   = "gdcm::Unfound";
+%constant const char *BINLOADED = "gdcm::Binary data loaded";
+%constant const char *NOTLOADED = "gdcm::NotLoaded";
+%constant const char *UNREAD    = "gdcm::UnRead";
+
 ////////////////////////////////////////////////////////////////////////////
 // Warning: Order matters !
 %include "gdcmCommon.h"