X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=1f99df65691608fc99cd3f32b30297d768cdefd7;hb=3306c0c4d4513e73e1ca1ab60922ca02dc86a870;hp=0b60c37da9f498b6d40d225a8b0945cec9d40a2c;hpb=1bae8d2ba47d1b9cc8acfb7b5ab82026e48275dd;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 0b60c37d..1f99df65 100644
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/25 15:46:11 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2004/12/16 13:46:37 $
+  Version:   $Revision: 1.35 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -54,11 +54,6 @@ ElementSet::~ElementSet()
    TagHT.clear();
 }
 
-
-//-----------------------------------------------------------------------------
-// Public
-
-
 //-----------------------------------------------------------------------------
 // Print
 /**
@@ -71,7 +66,10 @@ void ElementSet::Print(std::ostream& os)
    for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
       DocEntry* entry = i->second;
+
+      entry->SetPrintLevel(PrintLevel);
       entry->Print(os);   
+
       if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
       {
          (void)seqEntry;
@@ -82,6 +80,8 @@ void ElementSet::Print(std::ostream& os)
    }
 }
 
+//-----------------------------------------------------------------------------
+// Public
 /**
   * \brief   Writes the Header Entries (Dicom Elements)
   *          from the H Table
@@ -96,10 +96,9 @@ void ElementSet::WriteContent(std::ofstream* fp, FileType filetype)
       i->second->WriteContent(fp, filetype);
    } 
 }
-//-----------------------------------------------------------------------------
-// Protected
 
 //-----------------------------------------------------------------------------
+// Protected
 
 //-----------------------------------------------------------------------------
 // Private
@@ -126,41 +125,41 @@ bool ElementSet::AddEntry(DocEntry* newEntry)
 }
 
 /**
- * \brief   Clear the hash table from given entry BUT keep the entry.
- * @param   entryToRemove Entry to remove.
+ * \brief   Clear the hash table from given entry AND delete the entry.
+ * @param   entryToRemove Entry to remove AND delete.
+ * \warning Some problems when using under Windows... prefer the use of
+ *          Initialize / GetNext methods
  */
-bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
+bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
 {
    const TagKey& key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
       dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+      delete entryToRemove;
       return true;
    }
 
-   dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+   dbg.Verbose(0, "ElementSet::RemoveEntry: key not present");
    return false ;
 }
 
 /**
- * \brief   Clear the hash table from given entry AND delete the entry.
- * @param   entryToRemove Entry to remove AND delete.
- * \warning Some problems when using under Windows... prefer the use of
- *          Initialize / GetNext methods
+ * \brief   Clear the hash table from given entry BUT keep the entry.
+ * @param   entryToRemove Entry to remove.
  */
-bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
+bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
 {
    const TagKey& key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
       dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
-      delete entryToRemove;
       return true;
    }
 
-   dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+   dbg.Verbose(0, "ElementSet::RemoveEntry: key not present");
    return false ;
 }