X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=8dddf32077614fca22fbf8a135e6151aa65855d5;hb=425e3a7d460b4cb325508fd3cc01ca173fdc33e5;hp=eef8c5700dbccbe9857e6c1b9a060e01b2b9b1c1;hpb=f564e117e998524a24ec56587e058b7e3625455c;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index eef8c570..8dddf320 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2005/07/11 20:44:52 $ - Version: $Revision: 1.61 $ + 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 @@ -97,7 +97,7 @@ bool ElementSet::RemoveEntry( DocEntry *entryToRemove) return true; } - gdcmWarningMacro( "Key not present"); + gdcmWarningMacro( "Key not present : " << key); return false ; } @@ -115,7 +115,7 @@ bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove) return true; } - gdcmWarningMacro( "Key not present"); + gdcmWarningMacro( "Key not present " << key); return false ; } @@ -176,7 +176,6 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) if ( it!=TagHT.end() ) return it->second; -// this->Print( std::cerr ); return NULL; } @@ -195,6 +194,14 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) */ 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;