2004-09-23 Jean-Pierre Roux

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index ec3f2b436f923ce91373b76363e0e4cd92f1b74a..28f1d01f9c085f34c2bb4944b9e9f39d538ffb0b 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/31 14:24:47 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/09/22 01:01:36 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,9 +28,11 @@
  * \ingroup gdcmElementSet
  * \brief   Constructor from a given gdcmElementSet
  */
+//BOZ depthLevel is not usefull anymore
 gdcmElementSet::gdcmElementSet(int depthLevel) 
-              : gdcmDocEntrySet(depthLevel)
+              : gdcmDocEntrySet()
 {
+  (void)depthLevel;
 }
 
 /**
@@ -68,16 +70,13 @@ void gdcmElementSet::Print(std::ostream & os)
    {
       gdcmDocEntry* entry = i->second;
       entry->Print(os);   
-      bool PrintEndLine = true;
       if ( gdcmSeqEntry* seqEntry = dynamic_cast<gdcmSeqEntry*>(entry) )
       {
-         (void)seqEntry;  //not used
-         PrintEndLine = false;
-      }
-      if( PrintEndLine )
-      {
-         os << std::endl;
+         (void)seqEntry;
+         // Avoid the newline for a sequence:
+         continue;
       }
+      os << std::endl;
    }
 }
 
@@ -123,9 +122,27 @@ bool gdcmElementSet::AddEntry( gdcmDocEntry *newEntry)
 }
 
 /**
- * \brief   Clear the hash table from given entry.
+ * \brief   Clear the hash table from given entry BUT keep the entry.
  * @param   entryToRemove Entry to remove.
  */
+bool gdcmElementSet::RemoveEntryNoDestroy( gdcmDocEntry *entryToRemove)
+{
+   gdcmTagKey key = entryToRemove->GetKey();
+   if( TagHT.count(key) == 1 )
+   {
+      TagHT.erase(key);
+      dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+      return true;
+   }
+
+   dbg.Verbose(0, "gdcmElementSet::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.
+ */
 bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
 {
    gdcmTagKey key = entryToRemove->GetKey();
@@ -133,6 +150,7 @@ bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
    {
       TagHT.erase(key);
       dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+      delete entryToRemove;
       return true;
    }