X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=0b373346fdc4b77ca884123f8f7e6896f6cca8bf;hb=45a9005ae5c1975bbe932e43c8080a83c9daf29e;hp=067896c88174593582f86f7b64d9fcdf82bf4e86;hpb=28e546efc3dc694c93a006529aecad5c4821b432;p=gdcm.git

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 067896c8..0b373346 100644
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -1,8 +1,26 @@
-// gdcmElementSet.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmElementSet.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/22 14:42:02 $
+  Version:   $Revision: 1.12 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmElementSet.h"
 #include "gdcmDebug.h"
+#include "gdcmValEntry.h"
+#include "gdcmBinEntry.h"
+#include "gdcmSeqEntry.h"
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -10,10 +28,8 @@
  * \ingroup gdcmElementSet
  * \brief   Constructor from a given gdcmElementSet
  */
-gdcmElementSet::gdcmElementSet() {
-   //TagDocEntryHT tagHT est un champ de gdcmElementSet.
-   // inutile de faire new ?
-      
+gdcmElementSet::gdcmElementSet(int depthLevel) 
+              : gdcmDocEntrySet(depthLevel) {
 }
 
 /**
@@ -27,7 +43,7 @@ gdcmElementSet::~gdcmElementSet()
    {
       EntryToDelete = cc->second;
       if ( EntryToDelete )
-         delete EntryToDelete;  // TODO : a verifier
+         delete EntryToDelete;
    }
    tagHT.clear();
 }
@@ -36,13 +52,79 @@ gdcmElementSet::~gdcmElementSet()
 //-----------------------------------------------------------------------------
 // Public
 
+
+//-----------------------------------------------------------------------------
+// Print
+/**
+  * \brief   Prints the Header Entries (Dicom Elements)
+  *          from the H Table
+  * @return
+  */ 
+void gdcmElementSet::Print(std::ostream & os) {
+   for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
+   {
+      //(i)->second->SetPrintLevel(printLevel);
+      (i->second)->Print(os);   
+   } 
+}
+
+/**
+  * \brief   Writes the Header Entries (Dicom Elements)
+  *          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)  
+   {
+      e=i->second;
+      e->WriteCommonPart(fp, filetype);
+      std::cout<<e->GetKey() << " " << std::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);
+         continue;
+      }
+     if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(e) ) {
+         ValEntry->Write(fp);
+         continue;
+      }
+
+      if (gdcmSeqEntry* SeqEntry = dynamic_cast< gdcmSeqEntry* >(e) ) {
+         SeqEntry->Write(fp,filetype);
+         continue;
+      } 
+   } 
+}
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// Private
+
+
+/**
+ * \brief   add a new Dicom Element pointer to the H Table
+ * @param   NewEntry entry to add
+ */
 bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) {
    TagKey key;
    key = NewEntry->GetKey();
 
    if(tagHT.count(key) == 1)
    {
-      dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ", key.c_str());
+      dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ",
+                  key.c_str());
       return(false);
    } 
    else 
@@ -52,22 +134,20 @@ bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) {
    }   
 }
 
-// end-user intended : the guy *wants* to create his own SeQuence ?!?
-gdcmDocEntry *gdcmElementSet::NewDocEntryByNumber(guint16 group,
-                                                  guint16 element) {
-// TODO				  
-   gdcmDocEntry *a;   
-   return a;				  
-}
+/**
+ * \brief   Clear the hash table from given entry.
+ * @param   EntryToRemove Entry to remove.
+ */
+bool gdcmElementSet::RemoveEntry( gdcmDocEntry *EntryToRemove)
+{
+   TagKey key = EntryToRemove->GetKey();
+   if(tagHT.count(key) == 1)
+   {
+      tagHT.erase(key);
+      dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+      return true;
+   }
 
-gdcmDocEntry *gdcmElementSet::NewDocEntryByName  (std::string Name) {
-// TODO	: 			  
-   gdcmDocEntry *a;   
-   return a;
+   dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
+   return(false);
 }
-
-//-----------------------------------------------------------------------------
-// Protected
-
-//-----------------------------------------------------------------------------
-// Private