Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2005/02/07 08:48:18 $
- Version: $Revision: 1.58 $
+ Date: $Date: 2005/10/11 08:24:10 $
+ Version: $Revision: 1.64 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
const TagKey &key = newEntry->GetKey();
- if( TagHT.count(key) == 1 )
+ if ( TagHT.count(key) == 1 )
{
- gdcmWarningMacro( "Key already present: " << key.c_str());
+ gdcmWarningMacro( "Key already present: " << key );
return false;
}
else
bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
{
const TagKey &key = entryToRemove->GetKey();
- if( TagHT.count(key) == 1 )
+ if ( TagHT.count(key) == 1 )
{
TagHT.erase(key);
//gdcmWarningMacro( "One element erased.");
return true;
}
- gdcmWarningMacro( "Key not present");
+ gdcmWarningMacro( "Key not present : " << key);
return false ;
}
bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
{
const TagKey &key = entryToRemove->GetKey();
- if( TagHT.count(key) == 1 )
+ if ( TagHT.count(key) == 1 )
{
TagHT.erase(key);
//gdcmWarningMacro( "One element erased.");
return true;
}
- gdcmWarningMacro( "Key not present");
+ gdcmWarningMacro( "Key not present " << key);
return false ;
}
*/
void ElementSet::Print(std::ostream &os, std::string const & )
{
+ // Let's change the 'warning value' for Pixel Data,
+ // to avoid human reader to be confused by 'gdcm::NotLoaded'.
+ gdcm::BinEntry *pixelElement = GetBinEntry(0x7fe0,0x0010);
+ if ( pixelElement != 0 )
+ {
+ pixelElement->SetValue( gdcm::GDCM_PIXELDATA);
+ }
+
for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
{
DocEntry *entry = i->second;