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
* @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);
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
{
resultPath += '/';
}
- gdcmVerboseMacro( "Dictionary path set from environnement");
+ gdcmWarningMacro( "Dictionary path set from environnement");
}
else
{
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
/**