X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=b485261b2e1bce54a28c26b0cd531734f9d2eac3;hb=bac2910466f502dec4c1842527aa81a8f83f04b8;hp=e98a34462b713a6ef8a5b2e4bc71662397b22eb9;hpb=8e1fe98f7659cec85bcbce8551e28f8e45971370;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index e98a3446..b485261b 100644
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -1,33 +1,57 @@
-// gdcmElementSet.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmElementSet.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/16 16:20:23 $
+  Version:   $Revision: 1.30 $
+                                                                                
+  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.html 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"
+
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmElementSet
- * \brief   Constructor from a given gdcmElementSet
+ * \ingroup ElementSet
+ * \brief   Constructor from a given ElementSet
  */
-gdcmElementSet::gdcmElementSet(int depthLevel) 
-              : gdcmDocEntrySet(depthLevel) {
+//BOZ depthLevel is not usefull anymore
+ElementSet::ElementSet(int depthLevel) 
+              : DocEntrySet()
+{
+  (void)depthLevel;
 }
 
 /**
- * \ingroup gdcmElementSet
+ * \ingroup ElementSet
  * \brief   Canonical destructor.
  */
-gdcmElementSet::~gdcmElementSet() 
+ElementSet::~ElementSet() 
 {
-  gdcmDocEntry* EntryToDelete;  
-  for(TagDocEntryHT::iterator cc = tagHT.begin();cc != tagHT.end();++cc)
+   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
    {
-      EntryToDelete = cc->second;
-      if ( EntryToDelete )
-         delete EntryToDelete;  // TODO : a verifier
+      if ( cc->second )
+      {
+         delete cc->second;
+      }
    }
-   tagHT.clear();
+   TagHT.clear();
 }
 
 
@@ -42,15 +66,36 @@ gdcmElementSet::~gdcmElementSet()
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Print(std::ostream & os) {
-   for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
+void ElementSet::Print(std::ostream& os)
+{
+   for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
-      //(*i)->second->SetPrintLevel(printLevel);
-      (i->second)->Print(os);   
-   } 
+      DocEntry* entry = i->second;
+      entry->Print(os);   
+      if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
+      {
+         (void)seqEntry;
+         // Avoid the newline for a sequence:
+         continue;
+      }
+      os << std::endl;
+   }
 }
 
-
+/**
+  * \brief   Writes the Header Entries (Dicom Elements)
+  *          from the H Table
+  * @return
+  */ 
+void ElementSet::Write(std::ofstream* fp, FileType filetype)
+{
+   for (TagDocEntryHT::const_iterator i = TagHT.begin(); 
+                                     i != TagHT.end(); 
+                                    ++i)
+   {
+      i->second->Write(fp, filetype);
+   } 
+}
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -59,42 +104,61 @@ void gdcmElementSet::Print(std::ostream & os) {
 //-----------------------------------------------------------------------------
 // Private
 
-
 /**
  * \brief   add a new Dicom Element pointer to the H Table
- * @param   NewEntry entry to add
+ * @param   newEntry entry to add
  */
-bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) {
-   TagKey key;
-   key = NewEntry->GetKey();
+bool ElementSet::AddEntry(DocEntry* newEntry)
+{
+   const TagKey& key = newEntry->GetKey();
 
-   if(tagHT.count(key) == 1)
+   if( TagHT.count(key) == 1 )
    {
-      dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ",
+      dbg.Verbose(1, "ElementSet::AddEntry key already present: ",
                   key.c_str());
-      return(false);
-   } 
-   else 
+      return false;
+   }
+   else
+   {
+      TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry));
+      return true;
+   }
+}
+
+/**
+ * \brief   Clear the hash table from given entry BUT keep the entry.
+ * @param   entryToRemove Entry to remove.
+ */
+bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
+{
+   const TagKey& key = entryToRemove->GetKey();
+   if( TagHT.count(key) == 1 )
    {
-      tagHT[NewEntry->GetKey()] = NewEntry;
-      return(true);
-   }   
+      TagHT.erase(key);
+      dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+      return true;
+   }
+
+   dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+   return false ;
 }
 
 /**
- * \brief   Clear the hash table from given 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.
  */
-bool gdcmElementSet::RemoveEntry( gdcmDocEntry *EntryToRemove)
+bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
 {
-   TagKey key = EntryToRemove->GetKey();
-   if(tagHT.count(key) == 1)
+   const TagKey& key = entryToRemove->GetKey();
+   if( TagHT.count(key) == 1 )
    {
-      tagHT.erase(key);
-      dbg.Verbose(1, "gdcmElementSet::RemoveEntry: one element erased.");
+      TagHT.erase(key);
+      dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+      delete entryToRemove;
       return true;
    }
 
-   dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
-   return(false);
+   dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+   return false ;
 }
+} // end namespace gdcm