* gdcmPython/gdcm.i : bug fix. Now string are correctly converted in python

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 02063318609651db2274c2b8e6a0a0a1285a7196..60f837e298c41d289f098b02b1fbd7c8f43244c5 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/01 10:29:55 $
-  Version:   $Revision: 1.57 $
+  Date:      $Date: 2005/02/05 01:37:08 $
+  Version:   $Revision: 1.60 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,8 +69,8 @@ DictSet::~DictSet()
  * @param   name Symbolic name that be used as identifier of the newly 
  *          created dictionary.
  */
-Dict *DictSet::LoadDictFromFile(std::string const & filename, 
-                                DictKey const & name) 
+Dict *DictSet::LoadDictFromFile(std::string const &filename, 
+                                DictKey const &name) 
 {
    Dict *newDict = new Dict(filename);
    AppendDict(newDict, name);
@@ -127,6 +127,33 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
    return entry;
 }
 
+/**
+ * \brief   Get the first entry while visiting the DictSet
+ * \return  The first Dict if found, otherwhise NULL
+ */
+Dict *DictSet::GetFirstEntry()
+{
+   ItDictHt = Dicts.begin();
+   if( ItDictHt != Dicts.end() )
+      return ItDictHt->second;
+   return NULL;
+}
+
+/**
+ * \brief   Get the next entry while visiting the Hash table (DictSetHT)
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return  The next Dict if found, otherwhise NULL
+ */
+Dict *DictSet::GetNextEntry()
+{
+   gdcmAssertMacro (ItDictHt != Dicts.end());
+  
+   ++ItDictHt;
+   if ( ItDictHt != Dicts.end() )
+      return ItDictHt->second;
+   return NULL;
+}
+
 /**
  * \brief   Obtain from the GDCM_DICT_PATH environnement variable the
  *          path to directory containing the dictionaries. When
@@ -147,7 +174,7 @@ std::string DictSet::BuildDictPath()
       {
          resultPath += '/';
       }
-      gdcmVerboseMacro( "Dictionary path set from environnement");
+      gdcmWarningMacro( "Dictionary path set from environnement");
    } 
    else
    {
@@ -157,33 +184,6 @@ std::string DictSet::BuildDictPath()
    return resultPath;
 }
 
-/**
- * \brief   Get the first entry while visiting the DictSet
- * \return  The first Dict if found, otherwhise NULL
- */
-Dict *DictSet::GetFirstEntry()
-{
-   ItDictHt = Dicts.begin();
-   if( ItDictHt != Dicts.end() )
-      return ItDictHt->second;
-   return NULL;
-}
-
-/**
- * \brief   Get the next entry while visiting the Hash table (DictSetHT)
- * \note : meaningfull only if GetFirstEntry already called
- * \return  The next Dict if found, otherwhise NULL
- */
-Dict *DictSet::GetNextEntry()
-{
-   gdcmAssertMacro (ItDictHt != Dicts.end());
-  
-   ++ItDictHt;
-   if ( ItDictHt != Dicts.end() )
-      return ItDictHt->second;
-   return NULL;
-}
-
 //-----------------------------------------------------------------------------
 // Protected
 /**