X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=0b60c37da9f498b6d40d225a8b0945cec9d40a2c;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=261c623ce922555926b21d325dd10a40b380e55c;hpb=fea9426f960497d2d9124ab532d2097f2915678f;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 261c623c..0b60c37d 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/10/22 03:05:41 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.32 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -44,12 +44,11 @@ ElementSet::ElementSet(int depthLevel)
  */
 ElementSet::~ElementSet() 
 {
-  for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
    {
-      DocEntry* entryToDelete = cc->second;
-      if ( entryToDelete )
+      if ( cc->second )
       {
-         delete entryToDelete;
+         delete cc->second;
       }
    }
    TagHT.clear();
@@ -88,11 +87,13 @@ void ElementSet::Print(std::ostream& os)
   *          from the H Table
   * @return
   */ 
-void ElementSet::Write(std::ofstream* fp, FileType filetype)
+void ElementSet::WriteContent(std::ofstream* fp, FileType filetype)
 {
-   for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
+   for (TagDocEntryHT::const_iterator i = TagHT.begin(); 
+                                     i != TagHT.end(); 
+                                    ++i)
    {
-      i->second->Write(fp, filetype);
+      i->second->WriteContent(fp, filetype);
    } 
 }
 //-----------------------------------------------------------------------------
@@ -107,30 +108,30 @@ void ElementSet::Write(std::ofstream* fp, FileType filetype)
  * \brief   add a new Dicom Element pointer to the H Table
  * @param   newEntry entry to add
  */
-bool ElementSet::AddEntry( DocEntry* newEntry)
+bool ElementSet::AddEntry(DocEntry* newEntry)
 {
-   TagKey key = newEntry->GetKey();
+   const TagKey& key = newEntry->GetKey();
 
    if( TagHT.count(key) == 1 )
    {
       dbg.Verbose(1, "ElementSet::AddEntry key already present: ",
                   key.c_str());
-      return(false);
-   } 
-   else 
+      return false;
+   }
+   else
    {
-      TagHT[newEntry->GetKey()] = newEntry;
+      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)
+bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
 {
-   TagKey key = entryToRemove->GetKey();
+   const TagKey& key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
@@ -145,10 +146,12 @@ bool ElementSet::RemoveEntryNoDestroy( DocEntry* entryToRemove)
 /**
  * \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::RemoveEntry( DocEntry* entryToRemove)
 {
-   TagKey key = entryToRemove->GetKey();
+   const TagKey& key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
@@ -160,4 +163,33 @@ bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
    dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
    return false ;
 }
+
+/**
+ * \brief   Initialise the visit of the Hash table (TagHT)
+ */
+void ElementSet::Initialize()
+{
+   ItTagHT = TagHT.begin();
+}
+
+/**
+ * \brief   Get the next entry whil visiting the Hash table (TagHT)
+ * \return  The next DocEntry if found, otherwhise NULL
+ */
+DocEntry *ElementSet::GetNextEntry()
+{
+   if (ItTagHT != TagHT.end())
+   {
+      DocEntry *tmp = ItTagHT->second;
+      ++ItTagHT;
+
+      return(tmp);
+   }
+   else
+   {
+      return(NULL);
+   }
+}
+
+//-----------------------------------------------------------------------------
 } // end namespace gdcm