Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2005/05/11 15:01:47 $
- Version: $Revision: 1.75 $
+ Date: $Date: 2005/07/11 14:53:16 $
+ Version: $Revision: 1.78 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
TagName name;
std::ifstream from( filename.c_str() );
- if( !from )
+ if ( !from )
{
gdcmWarningMacro( "Can't open dictionary" << filename.c_str());
// Using default embeded one:
}
else
{
- while (!from.eof())
+ while (!from.eof() && from)
{
from >> std::hex;
from >> group;
{
const TagKey &key = newEntry.GetKey();
- if(KeyHt.count(key) == 1)
+ if ( KeyHt.count(key) == 1 )
{
- gdcmWarningMacro( "Already present" << key.c_str());
+ gdcmErrorMacro( "Already present:" << key );
return false;
}
else
bool Dict::RemoveEntry(TagKey const &key)
{
TagKeyHT::const_iterator it = KeyHt.find(key);
- if(it != KeyHt.end())
+ if ( it != KeyHt.end() )
{
KeyHt.erase(key);
}
else
{
- gdcmWarningMacro( "Unfound entry" << key.c_str());
+ gdcmWarningMacro( "Unfound entry" << key );
return false;
}
}
}
/**
- * \brief Get the dictionary entry identified by a given tag (group,element)
- * @param group group of the entry to be found
- * @param elem element of the entry to be found
+ * \brief Get the dictionary entry identified by a given tag ("group|element")
+ * @param key tag of the entry to be found
* @return the corresponding dictionary entry when existing, NULL otherwise
*/
DictEntry *Dict::GetEntry(TagKey const &key)
DictEntry *Dict::GetFirstEntry()
{
ItKeyHt = KeyHt.begin();
- if( ItKeyHt != KeyHt.end() )
+ if ( ItKeyHt != KeyHt.end() )
return &(ItKeyHt->second);
return NULL;
}