X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmSeqEntry.cxx;h=78911b138de921deae81b062e55830db0d8a54f0;hb=587eff0d2fdea1b61c4cc9aa21f06f2ba8b42c10;hp=f7669d3660d15a1b71542719fa90724704c1ac7e;hpb=21fa56d0388883f63f4cccf55cb42967d7ea5c30;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index f7669d36..78911b13 100644
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/02 15:14:18 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2005/01/24 16:10:53 $
+  Version:   $Revision: 1.50 $
                                                                                 
   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,14 +33,13 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup SeqEntry
  * \brief   Constructor from a given SeqEntry
  */
-SeqEntry::SeqEntry( DictEntry* e ) 
+SeqEntry::SeqEntry( DictEntry *e ) 
              : DocEntry(e)
 {
-   UsableLength = 0;
-   ReadLength = 0xffffffff;
+   Length       = 0;
+   ReadLength   = 0xffffffff;
    SQDepthLevel = -1;
 
    DelimitorMode = false;
@@ -50,11 +50,11 @@ SeqEntry::SeqEntry( DictEntry* e )
  * \brief   Constructor from a given SeqEntry
  * @param   e Pointer to existing Doc entry
  * @param   depth depth level of the current Seq entry
-  */
-SeqEntry::SeqEntry( DocEntry* e, int depth )
+ */
+SeqEntry::SeqEntry( DocEntry *e, int depth )
              : DocEntry( e->GetDictEntry() )
 {
-   UsableLength = 0;
+   Length       = 0;
    ReadLength   = 0xffffffff;
    SQDepthLevel = depth;
 
@@ -78,14 +78,14 @@ SeqEntry::~SeqEntry()
    }
 }
 
+//-----------------------------------------------------------------------------
+// Print
 /**
  * \brief   canonical Printer
  */
-void SeqEntry::Print( std::ostream &os )
+void SeqEntry::Print( std::ostream &os, std::string const & )
 {
    // First, Print the Dicom Element itself.
-   SetPrintLevel(2);   
-
    os << "S ";
    DocEntry::Print(os);
    os << std::endl;
@@ -96,6 +96,7 @@ void SeqEntry::Print( std::ostream &os )
    // Then, Print each SQ Item   
    for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
    {
+      (*cc)->SetPrintLevel(PrintLevel);
       (*cc)->Print(os);   
    }
 
@@ -108,21 +109,26 @@ void SeqEntry::Print( std::ostream &os )
       }
       if (SeqTerm != NULL)
       {
+         SeqTerm->SetPrintLevel(PrintLevel);
          SeqTerm->Print(os);
          os << std::endl;
       } 
       else 
       {
          // fuse
-         os << "      -------------- should have a sequence terminator item";
+         gdcmVerboseMacro("  -------- should have a sequence terminator item");
       }
    }                    
 }
 
+//-----------------------------------------------------------------------------
+// Public
 /*
  * \brief   canonical Writer
+ * @param fp pointer to an already open file
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  */
-void SeqEntry::WriteContent(std::ofstream* fp, FileType filetype)
+void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype)
 {
    uint16_t seq_term_gr = 0xfffe;
    uint16_t seq_term_el = 0xe0dd;
@@ -146,23 +152,42 @@ void SeqEntry::WriteContent(std::ofstream* fp, FileType filetype)
    binary_write(*fp, seq_term_lg);
 }
 
-//-----------------------------------------------------------------------------
-// Public
+/**
+ * \brief   Get the first entry while visiting the SeqEntry
+ * \return  The first SQItem if found, otherwhise NULL
+ */ 
+SQItem *SeqEntry::GetFirstSQItem()
+{
+   ItSQItem = Items.begin();
+   if (ItSQItem != Items.end())
+      return *ItSQItem;
+   return NULL;
+} 
 
-/// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.
-void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber)
+/**
+ * \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::GetNextSQItem()
 {
-   sqItem->SetSQItemNumber(itemNumber);
-   Items.push_back(sqItem);
+   gdcmAssertMacro (ItSQItem != Items.end())
+   {
+      ++ItSQItem;
+      if (ItSQItem != Items.end())
+         return *ItSQItem;
+   }
+   return NULL;
 }
-
+ 
 /**
  * \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)
+SQItem *SeqEntry::GetSQItem(int nb)
 {
    if (nb<0)
    {
@@ -178,8 +203,22 @@ SQItem* SeqEntry::GetSQItemByOrdinalNumber(int nb)
          return *cc;
       }
    }
-   return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME
+   return *(Items.end());
+}
+
+/// \brief retuens the number of SQItems within the current Sequence
+unsigned int SeqEntry::GetNumberOfSQItems()
+{
+   return Items.size();
 }
+
+/// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.
+void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber)
+{
+   sqItem->SetSQItemNumber(itemNumber);
+   Items.push_back(sqItem);
+}
+
 //-----------------------------------------------------------------------------
 // Protected