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

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 1f99df65..afabc9af 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/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
@@ -61,7 +61,7 @@ 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)
    {
@@ -70,7 +70,7 @@ 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;
          // Avoid the newline for a sequence:
@@ -87,7 +87,7 @@ void ElementSet::Print(std::ostream& os)
   *          from the H Table
   * @return
   */ 
-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
@@ -130,18 +129,18 @@ bool ElementSet::AddEntry(DocEntry* newEntry)
  * \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,24 +148,24 @@ 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)
  */
-void ElementSet::Initialize()
+void ElementSet::InitTraversal()
 {
    ItTagHT = TagHT.begin();
 }
@@ -182,11 +181,11 @@ DocEntry *ElementSet::GetNextEntry()
       DocEntry *tmp = ItTagHT->second;
       ++ItTagHT;
 
-      return(tmp);
+      return tmp;
    }
    else
    {
-      return(NULL);
+      return NULL;
    }
 }