X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=28f1d01f9c085f34c2bb4944b9e9f39d538ffb0b;hb=c460dc75a10d96fc38011db90fae5bcd8649b743;hp=fbf2d31df599347bb20110f02e05e126298ac689;hpb=b1520ca5b7b3665aa40c14b63169bfab92eece55;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index fbf2d31d..28f1d01f 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/06/22 13:47:33 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2004/09/22 01:01:36 $
+  Version:   $Revision: 1.21 $
                                                                                 
   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,12 +64,20 @@ gdcmElementSet::~gdcmElementSet()
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Print(std::ostream & os) {
-   for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
+void gdcmElementSet::Print(std::ostream & os)
+{
+   for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
-      //(i)->second->SetPrintLevel(printLevel);
-      (i->second)->Print(os);   
-   } 
+      gdcmDocEntry* entry = i->second;
+      entry->Print(os);   
+      if ( gdcmSeqEntry* seqEntry = dynamic_cast<gdcmSeqEntry*>(entry) )
+      {
+         (void)seqEntry;
+         // Avoid the newline for a sequence:
+         continue;
+      }
+      os << std::endl;
+   }
 }
 
 /**
@@ -73,35 +85,11 @@ void gdcmElementSet::Print(std::ostream & os) {
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Write(FILE *fp, FileType filetype) {
-
-// Troubles expected : BinEntries ARE ValEntries :-(
-// BinEntry is checked first, then ValEntry;
-
-   gdcmDocEntry *e;
-   for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
+void gdcmElementSet::Write(FILE *fp, FileType filetype)
+{
+   for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
-      e=i->second;	
-	   e->WriteCommonPart(fp, filetype);
-		std::cout<<e->GetKey() << " " << hex << e->GetVR() << " " 
-		         << e->GetName()
-		         << std::endl;
-					
-//		 e->Write(fp,filetype); // This will be the right way to proceed !
-		
-      if (gdcmBinEntry* BinEntry = dynamic_cast< gdcmBinEntry* >(e) ) {
-         BinEntry->Write(fp,filetype);
-			continue;
-      }
-		if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(e) ) {
-         ValEntry->Write(fp,filetype);
-			continue;
-      }
-
-      if (gdcmSeqEntry* SeqEntry = dynamic_cast< gdcmSeqEntry* >(e) ) {
-         SeqEntry->Write(fp,filetype);
-			continue;
-      } 
+      i->second->Write(fp, filetype);
    } 
 }
 //-----------------------------------------------------------------------------
@@ -112,16 +100,15 @@ void gdcmElementSet::Write(FILE *fp, FileType filetype) {
 //-----------------------------------------------------------------------------
 // Private
 
-
 /**
  * \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) {
-   TagKey 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());
@@ -129,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)
 {
-   TagKey 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 ;
 }