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

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 510ac747..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/01 10:29:55 $
-  Version:   $Revision: 1.52 $
+  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;
 }
@@ -62,21 +62,6 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
    } 
 }
 
-/**
- * \brief   delete all entries in the ElementSet
- */
-void ElementSet::ClearEntry()
-{
-   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
-   {
-      if ( cc->second )
-      {
-         delete cc->second;
-      }
-   }
-   TagHT.clear();
-}
-
 /**
  * \brief   add a new Dicom Element pointer to the H Table
  * @param   newEntry entry to add
@@ -87,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
@@ -107,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 ;
 }
 
@@ -126,16 +111,32 @@ 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 ;
 }
 
 /**
- * \brief   Get the first entry while visiting the DocEntrySet
+ * \brief   delete all entries in the ElementSet
+ */
+void ElementSet::ClearEntry()
+{
+   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+   {
+      if ( cc->second )
+      {
+         delete cc->second;
+      }
+   }
+   TagHT.clear();
+}
+
+/**
+ * \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);