ENH: Be more verbose on Win32

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 37340268a3fe5510c328290063ee13f2c59d83b8..afabc9af283024ab1be792978e7aca7055c828ee 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 10:37:54 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.42 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -44,22 +44,16 @@ 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();
 }
 
-
-//-----------------------------------------------------------------------------
-// Public
-
-
 //-----------------------------------------------------------------------------
 // Print
 /**
@@ -67,13 +61,16 @@ ElementSet::~ElementSet()
   *          from the H Table
   * @return
   */ 
-void ElementSet::Print(std::ostream& os)
+void ElementSet::Print(std::ostream &os, std::string const & )
 {
    for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
       DocEntry* entry = i->second;
+
+      entry->SetPrintLevel(PrintLevel);
       entry->Print(os);   
-      if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
+
+      if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(entry) )
       {
          (void)seqEntry;
          // Avoid the newline for a sequence:
@@ -83,24 +80,25 @@ void ElementSet::Print(std::ostream& os)
    }
 }
 
+//-----------------------------------------------------------------------------
+// Public
 /**
   * \brief   Writes the Header Entries (Dicom Elements)
   *          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)
    {
-      i->second->Write(fp, filetype);
+      i->second->WriteContent(fp, filetype);
    } 
 }
-//-----------------------------------------------------------------------------
-// Protected
 
 //-----------------------------------------------------------------------------
+// Protected
 
 //-----------------------------------------------------------------------------
 // Private
@@ -109,14 +107,13 @@ 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)
 {
-   const 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());
+      gdcmVerboseMacro( "Key already present: " << key.c_str());
       return false;
    }
    else
@@ -127,39 +124,70 @@ bool ElementSet::AddEntry(DocEntry* newEntry)
 }
 
 /**
- * \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 ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
+bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
 {
-   const TagKey& key = entryToRemove->GetKey();
+   const TagKey &key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+      gdcmVerboseMacro( "One element erased.");
+      delete entryToRemove;
       return true;
    }
 
-   dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+   gdcmVerboseMacro( "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 ElementSet::RemoveEntry( DocEntry* entryToRemove)
+bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
 {
-   const TagKey& key = entryToRemove->GetKey();
+   const TagKey &key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
-      delete entryToRemove;
+      gdcmVerboseMacro( "One element erased.");
       return true;
    }
 
-   dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+   gdcmVerboseMacro( "Key not present");
    return false ;
 }
+
+/**
+ * \brief   Initialise the visit of the Hash table (TagHT)
+ */
+void ElementSet::InitTraversal()
+{
+   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