X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=947170973357e917f07a358547cd990be73de6ae;hb=c4220b95e9d5e902a7468e408435bf6dea4950eb;hp=f22b4ae0fe2830fd9d0ca77886101eddb2c0b18a;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index f22b4ae0..94717097 100644
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:27 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2004/10/12 04:35:45 $
+  Version:   $Revision: 1.24 $
                                                                                 
   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.
+  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
@@ -22,30 +22,37 @@
 #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;
+      DocEntry* entryToDelete = cc->second;
+      if ( entryToDelete )
+      {
+         delete entryToDelete;
+      }
    }
-   tagHT.clear();
+   TagHT.clear();
 }
 
 
@@ -60,22 +67,20 @@ gdcmElementSet::~gdcmElementSet()
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Print(std::ostream & os)
+void ElementSet::Print(std::ostream& os)
 {
-   gdcmDocEntry* Entry;
-   for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
+   for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
-      Entry = i->second;
-      Entry->Print(os);   
-      bool PrintEndLine = true;
-      if ( gdcmSeqEntry* SeqEntry = dynamic_cast<gdcmSeqEntry*>(Entry) )
+      DocEntry* entry = i->second;
+      entry->Print(os);   
+      if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
       {
-         (void)SeqEntry;  //not used
-         PrintEndLine = false;
+         (void)seqEntry;
+         // Avoid the newline for a sequence:
+         continue;
       }
-      if (PrintEndLine)
-         os << std::endl;
-   } 
+      os << std::endl;
+   }
 }
 
 /**
@@ -83,10 +88,9 @@ void gdcmElementSet::Print(std::ostream & os)
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Write(FILE *fp, FileType filetype)
+void ElementSet::Write(FILE* fp, FileType filetype)
 {
-
-   for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
+   for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
       i->second->Write(fp, filetype);
    } 
@@ -101,39 +105,59 @@ void gdcmElementSet::Write(FILE *fp, FileType filetype)
 
 /**
  * \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) {
-   gdcmTagKey key;
-   key = NewEntry->GetKey();
+bool ElementSet::AddEntry( DocEntry* newEntry)
+{
+   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 
    {
-      tagHT[NewEntry->GetKey()] = NewEntry;
-      return(true);
+      TagHT[newEntry->GetKey()] = newEntry;
+      return true;
    }   
 }
 
 /**
- * \brief   Clear the hash table from given entry.
- * @param   EntryToRemove Entry to remove.
+ * \brief   Clear the hash table from given entry BUT keep the entry.
+ * @param   entryToRemove Entry to remove.
+ */
+bool ElementSet::RemoveEntryNoDestroy( DocEntry* entryToRemove)
+{
+   TagKey key = entryToRemove->GetKey();
+   if( TagHT.count(key) == 1 )
+   {
+      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 AND delete the entry.
+ * @param   entryToRemove Entry to remove AND delete.
  */
-bool gdcmElementSet::RemoveEntry( gdcmDocEntry *EntryToRemove)
+bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
 {
-   gdcmTagKey key = EntryToRemove->GetKey();
-   if(tagHT.count(key) == 1)
+   TagKey key = entryToRemove->GetKey();
+   if( TagHT.count(key) == 1 )
    {
-      tagHT.erase(key);
-      dbg.Verbose(0, "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