* Amelioration on the DictGroupName class

   -- BeNours

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 6d00135ed7c99a01e555d6e2711f31b23e87003a..81582499c36cd1cf0eafd850d848006d1aed1b2f 100644 (file)
--- 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).

diff --git a/src/gdcmDictGroupName.cxx b/src/gdcmDictGroupName.cxx
index 3095a4388dbfc0f333d2a6e13aa2071ae00e51a9..f714280cf2b0d7ef0c62f0381543a269505ab8ca 100644 (file)
--- a/src/gdcmDictGroupName.cxx
+++ b/src/gdcmDictGroupName.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictGroupName.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/04/06 08:59:46 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/04/06 12:49:27 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -50,7 +50,7 @@ DictGroupName::DictGroupName()
    {
       char buff[1024];
       uint16_t key;
-      GroupName value;
+      TagName value;
    
       while (!from.eof()) 
       {
@@ -80,7 +80,7 @@ DictGroupName::~DictGroupName()
 
 //-----------------------------------------------------------------------------
 // Public
-const GroupName &DictGroupName::GetName(uint16_t group)
+const TagName &DictGroupName::GetName(uint16_t group)
 {
    DictGroupNameHT::const_iterator it = groupName.find(group);
    if (it == groupName.end())

diff --git a/src/gdcmDictGroupName.h b/src/gdcmDictGroupName.h
index 50954354ff13637faacabeacd21e2a89f4902f28..b57ed4270156f5fa2b744435f9f35345d027e203 100644 (file)
--- a/src/gdcmDictGroupName.h
+++ b/src/gdcmDictGroupName.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictGroupName.h,v $
   Language:  C++
-  Date:      $Date: 2005/04/05 10:56:25 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/04/06 12:49:27 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,9 +28,8 @@ namespace gdcm
 {
 
 //-----------------------------------------------------------------------------
-typedef std::string GroupName;
 /// Group Name Hash Table
-typedef std::map<uint16_t, GroupName> DictGroupNameHT;
+typedef std::map<uint16_t, TagName> DictGroupNameHT;
 
 //-----------------------------------------------------------------------------
 /**
@@ -45,7 +44,7 @@ public:
 
    void Print(std::ostream &os = std::cout);
 
-   const GroupName &GetName(uint16_t group);
+   const TagName &GetName(uint16_t group);
 
 private:
    DictGroupNameHT groupName;