X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=8f81f255171b9690be8340ec7db9813e298200d9;hb=8a69df0f4018beae8c78a35bef30590e318128e5;hp=1f99df65691608fc99cd3f32b30297d768cdefd7;hpb=f5c7e83afd484a025285c64a09a89bd227087245;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 1f99df65..8f81f255 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/12/16 13:46:37 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/01/18 14:28:32 $
+  Version:   $Revision: 1.45 $
                                                                                 
   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
-  * @return
+  * @param os ostream to write to  
+  * @param indent Indentation string to be prepended during printing
   */ 
-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,9 +84,10 @@ void ElementSet::Print(std::ostream& os)
 /**
   * \brief   Writes the Header Entries (Dicom Elements)
   *          from the H Table
-  * @return
+  * @param fp ofstream to write to  
+  * @param filetype filetype
   */ 
-void ElementSet::WriteContent(std::ofstream* fp, FileType filetype)
+void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
 {
    for (TagDocEntryHT::const_iterator i = TagHT.begin(); 
                                      i != TagHT.end(); 
@@ -107,14 +107,13 @@ void ElementSet::WriteContent(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,21 +126,19 @@ 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)
+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 ;
 }
 
@@ -149,45 +146,45 @@ bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
  * \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)
 {
-   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.");
       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)
+ * \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();
+   if (ItTagHT != TagHT.end())
+      return  ItTagHT->second;
+   return NULL;
 }
 
 /**
- * \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()
 {
-   if (ItTagHT != TagHT.end())
-   {
-      DocEntry *tmp = ItTagHT->second;
-      ++ItTagHT;
+   gdcmAssertMacro (ItTagHT != TagHT.end());
 
-      return(tmp);
-   }
-   else
-   {
-      return(NULL);
-   }
+   ++ItTagHT;
+   if (ItTagHT != TagHT.end())
+      return  ItTagHT->second;
+   return NULL;
 }
 
 //-----------------------------------------------------------------------------