X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=dd2c6d1976c5d0383d5846379ad972c0c3d473a8;hb=8d10ccb6794a0f22234983990e2181a24625fbd8;hp=28f1d01f9c085f34c2bb4944b9e9f39d538ffb0b;hpb=987b9d86307ffd84dd676ccf5a504a3133308c44;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 28f1d01f..dd2c6d19 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/09/22 01:01:36 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2004/12/03 17:13:18 $
+  Version:   $Revision: 1.33 $
                                                                                 
   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,31 +22,33 @@
 #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
  */
 //BOZ depthLevel is not usefull anymore
-gdcmElementSet::gdcmElementSet(int depthLevel) 
-              : gdcmDocEntrySet()
+ElementSet::ElementSet(int depthLevel) 
+              : DocEntrySet()
 {
   (void)depthLevel;
 }
 
 /**
- * \ingroup gdcmElementSet
+ * \ingroup ElementSet
  * \brief   Canonical destructor.
  */
-gdcmElementSet::~gdcmElementSet() 
+ElementSet::~ElementSet() 
 {
-  for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
    {
-      gdcmDocEntry* entryToDelete = cc->second;
-      if ( entryToDelete )
+      if ( cc->second )
       {
-         delete entryToDelete;
+         delete cc->second;
       }
    }
    TagHT.clear();
@@ -64,13 +66,13 @@ gdcmElementSet::~gdcmElementSet()
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Print(std::ostream & os)
+void ElementSet::Print(std::ostream& os)
 {
    for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
-      gdcmDocEntry* entry = i->second;
+      DocEntry* entry = i->second;
       entry->Print(os);   
-      if ( gdcmSeqEntry* seqEntry = dynamic_cast<gdcmSeqEntry*>(entry) )
+      if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
       {
          (void)seqEntry;
          // Avoid the newline for a sequence:
@@ -85,11 +87,13 @@ void gdcmElementSet::Print(std::ostream & os)
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Write(FILE *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);
    } 
 }
 //-----------------------------------------------------------------------------
@@ -104,56 +108,88 @@ void gdcmElementSet::Write(FILE *fp, FileType filetype)
  * \brief   add a new Dicom Element pointer to the H Table
  * @param   newEntry entry to add
  */
-bool gdcmElementSet::AddEntry( gdcmDocEntry *newEntry)
+bool ElementSet::AddEntry(DocEntry* newEntry)
 {
-   gdcmTagKey key = newEntry->GetKey();
+   const TagKey& key = newEntry->GetKey();
 
    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[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.
+ * \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 gdcmElementSet::RemoveEntryNoDestroy( gdcmDocEntry *entryToRemove)
+bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
 {
-   gdcmTagKey key = entryToRemove->GetKey();
+   const TagKey& key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+      dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+      delete entryToRemove;
       return true;
    }
 
-   dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
+   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.
+ * \brief   Clear the hash table from given entry BUT keep the entry.
+ * @param   entryToRemove Entry to remove.
  */
-bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
+bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
 {
-   gdcmTagKey key = entryToRemove->GetKey();
+   const TagKey& key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
-      delete entryToRemove;
+      dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
       return true;
    }
 
-   dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
+   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