X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=2129c837e487109a4b2cfce69e5f91a99886ebfd;hb=0416947420d9168401c99e7fbf0dca0a081c9175;hp=1330a42f3f80195c40f52e2a8213c3367bb0329f;hpb=5b89bede4607999aeb8d5b45311e7ee82f9471ef;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 1330a42f..2129c837 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/02 16:18:48 $ - Version: $Revision: 1.53 $ + Date: $Date: 2005/02/07 08:48:18 $ + Version: $Revision: 1.58 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,7 +31,7 @@ namespace gdcm */ //BOZ depthLevel is not usefull anymore ElementSet::ElementSet(int depthLevel) - : DocEntrySet() + : DocEntrySet() { (void)depthLevel; } @@ -72,7 +72,7 @@ bool ElementSet::AddEntry(DocEntry *newEntry) if( TagHT.count(key) == 1 ) { - gdcmVerboseMacro( "Key already present: " << key.c_str()); + gdcmWarningMacro( "Key already present: " << key.c_str()); return false; } else @@ -92,12 +92,12 @@ bool ElementSet::RemoveEntry( DocEntry *entryToRemove) if( TagHT.count(key) == 1 ) { TagHT.erase(key); - //gdcmVerboseMacro( "One element erased."); + //gdcmWarningMacro( "One element erased."); delete entryToRemove; return true; } - gdcmVerboseMacro( "Key not present"); + gdcmWarningMacro( "Key not present"); return false ; } @@ -111,11 +111,11 @@ bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove) if( TagHT.count(key) == 1 ) { TagHT.erase(key); - //gdcmVerboseMacro( "One element erased."); + //gdcmWarningMacro( "One element erased."); return true; } - gdcmVerboseMacro( "Key not present"); + gdcmWarningMacro( "Key not present"); return false ; } @@ -135,7 +135,8 @@ void ElementSet::ClearEntry() } /** - * \brief Get the first entry while visiting the DocEntrySet + * \brief Get the first entry while visiting *the* 'zero level' DocEntrySet + * (DocEntries out of any Sequence) * \return The first DocEntry if found, otherwhise NULL */ DocEntry *ElementSet::GetFirstEntry() @@ -147,7 +148,8 @@ DocEntry *ElementSet::GetFirstEntry() } /** - * \brief Get the next entry while visiting the Hash table (TagHT) + * \brief Get the next entry while visiting *the* 'zero level' DocEntrySet + * (DocEntries out of any Sequence) * \note : meaningfull only if GetFirstEntry already called * \return The next DocEntry if found, otherwhise NULL */ @@ -194,7 +196,7 @@ void ElementSet::Print(std::ostream &os, std::string const & ) { for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - DocEntry* entry = i->second; + DocEntry *entry = i->second; entry->SetPrintLevel(PrintLevel); entry->Print(os);