* Test/ : rename VTK tests to have a best name for the tests

[gdcm.git] / src / gdcmSeqEntry.cxx

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 9f2c4d195f3f622047720f68595af5b92c86cbf4..243ae59cf7474991c58c8fb40d28fa9fa5da7496 100644 (file)
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 16:45:52 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2005/01/18 14:28:32 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,6 +21,7 @@
 #include "gdcmTS.h"
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
 #include <iostream>
 #include <iomanip>
@@ -32,7 +33,6 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup SeqEntry
  * \brief   Constructor from a given SeqEntry
  */
 SeqEntry::SeqEntry( DictEntry *e ) 
@@ -81,7 +81,7 @@ SeqEntry::~SeqEntry()
 /**
  * \brief   canonical Printer
  */
-void SeqEntry::Print( std::ostream &os )
+void SeqEntry::Print( std::ostream &os, std::string const & )
 {
    // First, Print the Dicom Element itself.
    os << "S ";
@@ -114,7 +114,7 @@ void SeqEntry::Print( std::ostream &os )
       else 
       {
          // fuse
-         os << "      -------------- should have a sequence terminator item";
+         gdcmVerboseMacro("  -------- should have a sequence terminator item");
       }
    }                    
 }
@@ -159,7 +159,7 @@ void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber)
 /**
  * \brief return a pointer to the SQItem referenced by its ordinal number.
  *        Returns the first item when argument is negative.
- *        Returns the last item when argument is bigget than the total
+ *        Returns the last item when argument is bigger than the total
  *        item number.
  */
 SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb)
@@ -180,6 +180,36 @@ SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb)
    }
    return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME
 }
+
+/**
+ * \brief   Get the first entry while visiting the SeqEntry
+ * \return  The first SQItem if found, otherwhise NULL
+ */ 
+SQItem *SeqEntry::GetFirstEntry()
+{
+   ItSQItem = Items.begin();
+   if (ItSQItem != Items.end())
+      return *ItSQItem;
+   return NULL;
+} 
+
+/**
+ * \brief   Get the next SQItem while visiting the SeqEntry
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return  The next SQItem if found, otherwhise NULL
+ */
+
+SQItem *SeqEntry::GetNextEntry()
+{
+   gdcmAssertMacro (ItSQItem != Items.end())
+   {
+      ++ItSQItem;
+      if (ItSQItem != Items.end())
+         return *ItSQItem;
+   }
+   return NULL;
+}
+ 
 //-----------------------------------------------------------------------------
 // Protected