2005-01-18 Jean-Pierre Roux <jpr@creatis.univ-lyon1.fr>

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index f30da69b6bd7ac993ba4d919703bf7a44736f4c2..769c7814034f358ddfe93f54b0c6950b44179b9d 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: 2005/01/07 16:26:12 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/01/18 08:01:41 $
+  Version:   $Revision: 1.43 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,6 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup ElementSet
  * \brief   Constructor from a given ElementSet
  */
 //BOZ depthLevel is not usefull anymore
@@ -39,7 +38,6 @@ ElementSet::ElementSet(int depthLevel)
 }
 
 /**
- * \ingroup ElementSet
  * \brief   Canonical destructor.
  */
 ElementSet::~ElementSet() 
@@ -59,9 +57,10 @@ ElementSet::~ElementSet()
 /**
   * \brief   Prints the Header Entries (Dicom Elements)
   *          from the H Table
+  * @param os ostream to write to  
   * @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)
    {
@@ -70,9 +69,9 @@ void ElementSet::Print(std::ostream &os)
       entry->SetPrintLevel(PrintLevel);
       entry->Print(os);   
 
-      if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(entry) )
+      if ( /*SeqEntry *seqEntry = */dynamic_cast<SeqEntry*>(entry) )
       {
-         (void)seqEntry;
+         //(void)seqEntry;
          // Avoid the newline for a sequence:
          continue;
       }
@@ -85,6 +84,7 @@ void ElementSet::Print(std::ostream &os)
 /**
   * \brief   Writes the Header Entries (Dicom Elements)
   *          from the H Table
+  * @param os ostream to write to  
   * @return
   */ 
 void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
@@ -113,8 +113,7 @@ bool ElementSet::AddEntry(DocEntry *newEntry)
 
    if( TagHT.count(key) == 1 )
    {
-      Debug::Verbose(1, "ElementSet::AddEntry key already present: ",
-                  key.c_str());
+      gdcmVerboseMacro( "Key already present: " << key.c_str());
       return false;
    }
    else
@@ -127,8 +126,6 @@ bool ElementSet::AddEntry(DocEntry *newEntry)
 /**
  * \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)
 {
@@ -136,12 +133,12 @@ bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      Debug::Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+      //gdcmVerboseMacro( "One element erased.");
       delete entryToRemove;
       return true;
    }
 
-   Debug::Verbose(0, "ElementSet::RemoveEntry: key not present");
+   gdcmVerboseMacro( "Key not present");
    return false ;
 }
 
@@ -155,24 +152,27 @@ bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
    if( TagHT.count(key) == 1 )
    {
       TagHT.erase(key);
-      Debug::Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+      //gdcmVerboseMacro( "One element erased.");
       return true;
    }
 
-   Debug::Verbose(0, "ElementSet::RemoveEntry: key not present");
+   gdcmVerboseMacro( "Key not present");
    return false ;
 }
 
 /**
- * \brief   Initialise the visit of the Hash table (TagHT)
+ * \brief   Get the first entry while visiting the DocEntrySet
+ * \return  The first DocEntry if found, otherwhise NULL
  */
-void ElementSet::Initialize()
+DocEntry *ElementSet::GetFirstEntry()
 {
    ItTagHT = TagHT.begin();
+   return ItTagHT->second;
 }
 
 /**
- * \brief   Get the next entry whil visiting the Hash table (TagHT)
+ * \brief   Get the next entry while visiting the Hash table (TagHT)
+ * \note : meaningfull only if GetFirstEntry already called 
  * \return  The next DocEntry if found, otherwhise NULL
  */
 DocEntry *ElementSet::GetNextEntry()
@@ -182,11 +182,11 @@ DocEntry *ElementSet::GetNextEntry()
       DocEntry *tmp = ItTagHT->second;
       ++ItTagHT;
 
-      return(tmp);
+      return tmp;
    }
    else
    {
-      return(NULL);
+      return NULL;
    }
 }