X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=7b047295c3205a8fdd7190561e10987e32d0ba23;hb=df832cf7f90b4ca5aca2f628c1756fb276779fac;hp=43cad17bbc59414fd39e210a02e8325a22f92689;hpb=488753d3ca16596e899e06b8d951a0124ac36d6e;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 43cad17b..7b047295 100644
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/12/01 09:12:21 $
-  Version:   $Revision: 1.64 $
+  Date:      $Date: 2007/10/08 15:20:17 $
+  Version:   $Revision: 1.72 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,15 +27,17 @@
 #include <iomanip>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
+// Constructor / Destructor
+
 // Constructor / Destructor
 /**
  * \brief   Constructor from a given SeqEntry
  */
-SeqEntry::SeqEntry( DictEntry *e ) 
-             : DocEntry(e)
+SeqEntry::SeqEntry( uint16_t group,uint16_t elem ) 
+             : DocEntry(group, elem, "SQ")
 {
    Length       = 0;
    ReadLength   = 0xffffffff;
@@ -51,7 +53,8 @@ SeqEntry::SeqEntry( DictEntry *e )
  * @param   depth depth level of the current Seq entry
  */
 SeqEntry::SeqEntry( DocEntry *e, int depth )
-             : DocEntry( e->GetDictEntry() )
+             //: DocEntry( e->GetDictEntry() )
+            : DocEntry( e->GetGroup(), e->GetElement(), "SQ" /*e->GetVR()*/ )
 {
    Length       = 0;
    ReadLength   = 0xffffffff;
@@ -77,7 +80,7 @@ SeqEntry::~SeqEntry()
  * @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, bool , bool )
 {
    uint16_t seq_term_gr = 0xfffe;
    uint16_t seq_term_el = 0xe0dd;
@@ -86,13 +89,14 @@ void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype)
    // ignore 'Zero length' Sequences
    if ( GetReadLength() == 0 )
       return;
-       
-   DocEntry::WriteContent(fp, filetype);
+   // false : we are not in MetaElements
+   // true : we are inside a Sequence
+   DocEntry::WriteContent(fp, filetype, false, true);
    for(ListSQItem::iterator cc  = Items.begin();
                             cc != Items.end();
                           ++cc)
-   {        
-      (*cc)->WriteContent(fp, filetype);
+   {   
+      (*cc)->WriteContent(fp, filetype, false, true);
    }
    
    // we force the writting of a Sequence Delimitation item
@@ -271,8 +275,9 @@ void SeqEntry::Copy(DocEntry *doc)
  */
 void SeqEntry::Print( std::ostream &os, std::string const & )
 {
-   // First, Print the Dicom Element itself.
-   os << "S ";
+   // os << "S ";
+   
+   // First, Print the common part (vr [length offset] name).
    DocEntry::Print(os);
    os << std::endl;