BUG: very same bug when using char* instead of string

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 36ebbd2b32ef09b888e0bad868309ba3740710d7..f22b4ae0fe2830fd9d0ca77886101eddb2c0b18a 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -1,8 +1,26 @@
-// gdcmElementSet.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmElementSet.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/07/02 13:55:27 $
+  Version:   $Revision: 1.15 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmElementSet.h"
 #include "gdcmDebug.h"
+#include "gdcmValEntry.h"
+#include "gdcmBinEntry.h"
+#include "gdcmSeqEntry.h"
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -25,7 +43,7 @@ gdcmElementSet::~gdcmElementSet()
    {
       EntryToDelete = cc->second;
       if ( EntryToDelete )
-         delete EntryToDelete;  // TODO : a verifier
+         delete EntryToDelete;
    }
    tagHT.clear();
 }
@@ -42,15 +60,37 @@ gdcmElementSet::~gdcmElementSet()
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Print(std::ostream & os) {
+void gdcmElementSet::Print(std::ostream & os)
+{
+   gdcmDocEntry* Entry;
    for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
    {
-      //(*i)->second->SetPrintLevel(printLevel);
-      (i->second)->Print(os);   
+      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;
    } 
 }
 
+/**
+  * \brief   Writes the Header Entries (Dicom Elements)
+  *          from the H Table
+  * @return
+  */ 
+void gdcmElementSet::Write(FILE *fp, FileType filetype)
+{
 
+   for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
+   {
+      i->second->Write(fp, filetype);
+   } 
+}
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -59,18 +99,18 @@ void gdcmElementSet::Print(std::ostream & os) {
 //-----------------------------------------------------------------------------
 // Private
 
-
 /**
  * \brief   add a new Dicom Element pointer to the H Table
  * @param   NewEntry entry to add
  */
 bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) {
-   TagKey key;
+   gdcmTagKey key;
    key = NewEntry->GetKey();
 
    if(tagHT.count(key) == 1)
    {
-      dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ", key.c_str());
+      dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ",
+                  key.c_str());
       return(false);
    } 
    else 
@@ -80,3 +120,20 @@ bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) {
    }   
 }
 
+/**
+ * \brief   Clear the hash table from given entry.
+ * @param   EntryToRemove Entry to remove.
+ */
+bool gdcmElementSet::RemoveEntry( 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);
+}