* src/gdcmDocEntry.[h|cxx] : now the ReadLength is the length of the datas

[gdcm.git] / src / gdcmSeqEntry.cxx

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index a0e53cfe0043d24e5e66a396d56b49cd23731f9a..9f2c4d195f3f622047720f68595af5b92c86cbf4 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: 2004/11/24 16:39:19 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/01/07 16:45:52 $
+  Version:   $Revision: 1.42 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,11 +35,11 @@ namespace gdcm
  * \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;
@@ -51,10 +51,10 @@ SeqEntry::SeqEntry( DictEntry* e )
  * @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;
 
@@ -72,7 +72,7 @@ SeqEntry::~SeqEntry()
    {
       delete *cc;
    }
-   if (!SeqTerm)
+   if (SeqTerm)
    {
       delete SeqTerm;
    }
@@ -84,8 +84,6 @@ SeqEntry::~SeqEntry()
 void SeqEntry::Print( std::ostream &os )
 {
    // First, Print the Dicom Element itself.
-   SetPrintLevel(2);   
-
    os << "S ";
    DocEntry::Print(os);
    os << std::endl;
@@ -96,6 +94,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,6 +107,7 @@ void SeqEntry::Print( std::ostream &os )
       }
       if (SeqTerm != NULL)
       {
+         SeqTerm->SetPrintLevel(PrintLevel);
          SeqTerm->Print(os);
          os << std::endl;
       } 
@@ -122,7 +122,7 @@ void SeqEntry::Print( std::ostream &os )
 /*
  * \brief   canonical Writer
  */
-void SeqEntry::Write(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;
@@ -131,12 +131,12 @@ void SeqEntry::Write(std::ofstream* fp, FileType filetype)
    //uint16_t item_term_gr = 0xfffe;
    //uint16_t item_term_el = 0xe00d;
    
-   DocEntry::Write(fp, filetype);
+   DocEntry::WriteContent(fp, filetype);
    for(ListSQItem::iterator cc  = Items.begin();
                             cc != Items.end();
                           ++cc)
    {        
-      (*cc)->Write(fp, filetype);
+      (*cc)->WriteContent(fp, filetype);
    }
    
    // we force the writting of a Sequence Delimitation item
@@ -162,7 +162,7 @@ void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber)
  *        Returns the last item when argument is bigget than the total
  *        item number.
  */
-SQItem* SeqEntry::GetSQItemByOrdinalNumber(int nb)
+SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb)
 {
    if (nb<0)
    {