Cosmetic modifs to be more Coding style compliant

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index f22b4ae0fe2830fd9d0ca77886101eddb2c0b18a..5d46a76f3a9cc806686067e80b2ba3cbfa2782f6 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/07/02 13:55:27 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2004/09/24 11:39:21 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,8 +28,11 @@
  * \ingroup gdcmElementSet
  * \brief   Constructor from a given gdcmElementSet
  */
+//BOZ depthLevel is not usefull anymore
 gdcmElementSet::gdcmElementSet(int depthLevel) 
-              : gdcmDocEntrySet(depthLevel) {
+              : gdcmDocEntrySet()
+{
+  (void)depthLevel;
 }
 
 /**
@@ -38,14 +41,15 @@ gdcmElementSet::gdcmElementSet(int depthLevel)
  */
 gdcmElementSet::~gdcmElementSet() 
 {
-  gdcmDocEntry* EntryToDelete;  
-  for(TagDocEntryHT::iterator cc = tagHT.begin();cc != tagHT.end();++cc)
+  for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
    {
-      EntryToDelete = cc->second;
-      if ( EntryToDelete )
-         delete EntryToDelete;
+      gdcmDocEntry* entryToDelete = cc->second;
+      if ( entryToDelete )
+      {
+         delete entryToDelete;
+      }
    }
-   tagHT.clear();
+   TagHT.clear();
 }
 
 
@@ -60,22 +64,20 @@ gdcmElementSet::~gdcmElementSet()
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Print(std::ostream & os)
+void gdcmElementSet::Print(std::ostream& os)
 {
-   gdcmDocEntry* Entry;
-   for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
+   for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
-      Entry = i->second;
-      Entry->Print(os);   
-      bool PrintEndLine = true;
-      if ( gdcmSeqEntry* SeqEntry = dynamic_cast<gdcmSeqEntry*>(Entry) )
+      gdcmDocEntry* entry = i->second;
+      entry->Print(os);   
+      if ( gdcmSeqEntry* seqEntry = dynamic_cast<gdcmSeqEntry*>(entry) )
       {
-         (void)SeqEntry;  //not used
-         PrintEndLine = false;
+         (void)seqEntry;
+         // Avoid the newline for a sequence:
+         continue;
       }
-      if (PrintEndLine)
-         os << std::endl;
-   } 
+      os << std::endl;
+   }
 }
 
 /**
@@ -83,10 +85,9 @@ void gdcmElementSet::Print(std::ostream & os)
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Write(FILE *fp, FileType filetype)
+void gdcmElementSet::Write(FILE* fp, FileType filetype)
 {
-
-   for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
+   for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
       i->second->Write(fp, filetype);
    } 
@@ -101,13 +102,13 @@ void gdcmElementSet::Write(FILE *fp, FileType filetype)
 
 /**
  * \brief   add a new Dicom Element pointer to the H Table
- * @param   NewEntry entry to add
+ * @param   newEntry entry to add
  */
-bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) {
-   gdcmTagKey key;
-   key = NewEntry->GetKey();
+bool gdcmElementSet::AddEntry( gdcmDocEntry* newEntry)
+{
+   gdcmTagKey key = newEntry->GetKey();
 
-   if(tagHT.count(key) == 1)
+   if( TagHT.count(key) == 1 )
    {
       dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ",
                   key.c_str());
@@ -115,25 +116,44 @@ bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) {
    } 
    else 
    {
-      tagHT[NewEntry->GetKey()] = NewEntry;
-      return(true);
+      TagHT[newEntry->GetKey()] = newEntry;
+      return true;
    }   
 }
 
 /**
- * \brief   Clear the hash table from given entry.
- * @param   EntryToRemove Entry to remove.
+ * \brief   Clear the hash table from given entry BUT keep the entry.
+ * @param   entryToRemove Entry to remove.
+ */
+bool gdcmElementSet::RemoveEntryNoDestroy( gdcmDocEntry* entryToRemove)
+{
+   gdcmTagKey key = entryToRemove->GetKey();
+   if( TagHT.count(key) == 1 )
+   {
+      TagHT.erase(key);
+      dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+      return true;
+   }
+
+   dbg.Verbose(0, "gdcmElementSet::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.
  */
-bool gdcmElementSet::RemoveEntry( gdcmDocEntry *EntryToRemove)
+bool gdcmElementSet::RemoveEntry( gdcmDocEntry* entryToRemove)
 {
-   gdcmTagKey key = EntryToRemove->GetKey();
-   if(tagHT.count(key) == 1)
+   gdcmTagKey key = entryToRemove->GetKey();
+   if( TagHT.count(key) == 1 )
    {
-      tagHT.erase(key);
+      TagHT.erase(key);
       dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+      delete entryToRemove;
       return true;
    }
 
    dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
-   return(false);
+   return false ;
 }