* Add GetFirstValEntry + GetNexxtValEntry, for Python users

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index dbf05c6065215f64dcf39c1dadd5bc4f271ede86..7b306ee2b41b65d3b805cd38920e15726d9bbcf2 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: 2005/01/25 15:44:24 $
-  Version:   $Revision: 1.51 $
+  Date:      $Date: 2005/02/04 14:49:01 $
+  Version:   $Revision: 1.54 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,7 +24,6 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -45,31 +44,6 @@ ElementSet::~ElementSet()
    ClearEntry();
 }
 
-//-----------------------------------------------------------------------------
-// Print
-/**
-  * \brief   Prints the Header Entries (Dicom Elements) from the H Table
-  * @param os ostream to write to  
-  * @param indent Indentation string to be prepended during printing
-  */ 
-void ElementSet::Print(std::ostream &os, std::string const & )
-{
-   for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
-   {
-      DocEntry* entry = i->second;
-
-      entry->SetPrintLevel(PrintLevel);
-      entry->Print(os);   
-
-      if ( dynamic_cast<SeqEntry*>(entry) )
-      {
-         // Avoid the newline for a sequence:
-         continue;
-      }
-      os << std::endl;
-   }
-}
-
 //-----------------------------------------------------------------------------
 // Public
 /**
@@ -88,21 +62,6 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
    } 
 }
 
-/**
- * \brief   delete all entries in the ElementSet
- */
-void ElementSet::ClearEntry()
-{
-   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
-   {
-      if ( cc->second )
-      {
-         delete cc->second;
-      }
-   }
-   TagHT.clear();
-}
-
 /**
  * \brief   add a new Dicom Element pointer to the H Table
  * @param   newEntry entry to add
@@ -161,7 +120,23 @@ bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
 }
 
 /**
- * \brief   Get the first entry while visiting the DocEntrySet
+ * \brief   delete all entries in the ElementSet
+ */
+void ElementSet::ClearEntry()
+{
+   for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+   {
+      if ( cc->second )
+      {
+         delete cc->second;
+      }
+   }
+   TagHT.clear();
+}
+
+/**
+ * \brief   Get the first entry while visiting *the* 'zero level' DocEntrySet
+ *              (DocEntries out of any Sequence)
  * \return  The first DocEntry if found, otherwhise NULL
  */
 DocEntry *ElementSet::GetFirstEntry()
@@ -173,7 +148,8 @@ DocEntry *ElementSet::GetFirstEntry()
 }
 
 /**
- * \brief   Get the next entry while visiting the Hash table (TagHT)
+ * \brief   Get the next entry while visiting *the* 'zero level' DocEntrySet
+ *              (DocEntries out of any Sequence) 
  * \note : meaningfull only if GetFirstEntry already called 
  * \return  The next DocEntry if found, otherwhise NULL
  */
@@ -187,6 +163,45 @@ DocEntry *ElementSet::GetNextEntry()
    return NULL;
 }
 
+/**
+ * \brief   Get the first ValEntry while visiting *the* 'zero level' DocEntrySet
+ *              (DocEntries out of any Sequence)
+ *              This method is designed for Python users
+ * \return  The first ValEntry if found, otherwhise NULL
+ */
+ValEntry *ElementSet::GetFirstValEntry()
+{
+   gdcm::ValEntry *valEntry;
+   gdcm::DocEntry *d = GetFirstEntry();
+   // an other iterator is needed to allow user iterate 
+   // at the same time both on DocEntries and ValEntries 
+   ItValEntryTagHT = ItTagHT;
+   if ( valEntry = dynamic_cast<gdcm::ValEntry*>(d)) 
+      return valEntry;
+   return  GetNextValEntry();  
+}
+
+/**
+ * \brief   Get the next ValEntry while visiting *the* 'zero level' DocEntrySet
+ *              (DocEntries out of any Sequence) 
+ * \note : meaningfull only if GetFirstValEntry already called 
+ * \return  The next ValEntry if found, otherwhise NULL
+ */
+ValEntry *ElementSet::GetNextValEntry()
+{
+   gdcm::ValEntry *valEntry;
+   gdcm::DocEntry *d = ItValEntryTagHT->second;
+   ++ItValEntryTagHT; 
+   while( d )
+   {
+      if ( valEntry = dynamic_cast<gdcm::ValEntry*>(d))
+         return valEntry;
+      else
+         return GetNextValEntry(); 
+   }
+   return 0;
+}
+
 /**
  * \brief  retrieves a Dicom Element using (group, element)
  * @param   group  Group number of the searched Dicom Element 
@@ -209,5 +224,30 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem)
 //-----------------------------------------------------------------------------
 // Private
 
+//-----------------------------------------------------------------------------
+// Print
+/**
+  * \brief   Prints the Header Entries (Dicom Elements) from the H Table
+  * @param os ostream to write to  
+  * @param indent Indentation string to be prepended during printing
+  */ 
+void ElementSet::Print(std::ostream &os, std::string const & )
+{
+   for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
+   {
+      DocEntry* entry = i->second;
+
+      entry->SetPrintLevel(PrintLevel);
+      entry->Print(os);   
+
+      if ( dynamic_cast<SeqEntry*>(entry) )
+      {
+         // Avoid the newline for a sequence:
+         continue;
+      }
+      os << std::endl;
+   }
+}
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm