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/18 09:17:08 $
+ Version: $Revision: 1.66 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmElementSet.h"
#include "gdcmDebug.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
#include "gdcmSeqEntry.h"
+#include "gdcmDataEntry.h"
namespace gdcm
{
/**
* \brief Constructor for a given ElementSet
*/
-//BOZ depthLevel is not usefull anymore
-ElementSet::ElementSet(int depthLevel)
+ElementSet::ElementSet()
: DocEntrySet()
{
- (void)depthLevel;
}
/**
{
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'.
+ DataEntry *pixelElement = GetDataEntry(0x7fe0,0x0010);
+ if ( pixelElement != 0 )
+ {
+ pixelElement->SetFlag( DataEntry::FLAG_PIXELDATA );
+ }
+
for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
{
DocEntry *entry = i->second;
entry->SetPrintLevel(PrintLevel);
entry->Print(os);
- if ( dynamic_cast<SeqEntry*>(entry) )
+ if ( dynamic_cast<SeqEntry *>(entry) )
{
// Avoid the newline for a sequence:
continue;