X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=8dddf32077614fca22fbf8a135e6151aa65855d5;hb=77cbc8232f9308aafb17bde18ef9549be212b741;hp=2129c837e487109a4b2cfce69e5f91a99886ebfd;hpb=0416947420d9168401c99e7fbf0dca0a081c9175;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 2129c837..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/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
@@ -70,9 +70,9 @@ bool ElementSet::AddEntry(DocEntry *newEntry)
 {
    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
@@ -89,7 +89,7 @@ bool ElementSet::AddEntry(DocEntry *newEntry)
 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.");
@@ -97,7 +97,7 @@ bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
       return true;
    }
 
-   gdcmWarningMacro( "Key not present");
+   gdcmWarningMacro( "Key not present : " << key);
    return false ;
 }
 
@@ -108,14 +108,14 @@ bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
 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 ;
 }
 
@@ -194,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;