Removal of useless and dangerous methods :

[gdcm.git] / src / gdcmSeqEntry.cxx

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 76d57104390038b2aeaa75b021b5056aece136f7..1962d89fbf0244bde1f7683aba3580c369de4400 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/15 02:18:37 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/01/06 20:03:28 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,7 +35,7 @@ namespace gdcm
  * \ingroup SeqEntry
  * \brief   Constructor from a given SeqEntry
  */
-SeqEntry::SeqEntry( DictEntry* e ) 
+SeqEntry::SeqEntry( DictEntry *e ) 
              : DocEntry(e)
 {
    UsableLength = 0;
@@ -51,7 +51,7 @@ 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;
@@ -60,6 +60,7 @@ SeqEntry::SeqEntry( DocEntry* e, int depth )
 
    ImplicitVR   = e->IsImplicitVR();
    Offset       = e->GetOffset();
+   SeqTerm = NULL;
 }
 
 /**
@@ -71,7 +72,7 @@ SeqEntry::~SeqEntry()
    {
       delete *cc;
    }
-   if (!SeqTerm)
+   if (SeqTerm)
    {
       delete SeqTerm;
    }
@@ -83,7 +84,7 @@ SeqEntry::~SeqEntry()
 void SeqEntry::Print( std::ostream &os )
 {
    // First, Print the Dicom Element itself.
-   SetPrintLevel(2);   
+   os << "S ";
    DocEntry::Print(os);
    os << std::endl;
 
@@ -93,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);   
    }
 
@@ -105,6 +107,7 @@ void SeqEntry::Print( std::ostream &os )
       }
       if (SeqTerm != NULL)
       {
+         SeqTerm->SetPrintLevel(PrintLevel);
          SeqTerm->Print(os);
          os << std::endl;
       } 
@@ -119,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;
@@ -128,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
@@ -159,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)
    {