X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=afb8f04a515072ca148d6fad9b493338f14ac566;hb=b06cbd9177331d793223eac6bf8b2bccf874e7e3;hp=9ce89bbc3e3e8196e922b6c2fed20e669f48b9c1;hpb=17ebda2271dd65565f512e835546b22c22ebbbb0;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 9ce89bbc..afb8f04a 100644
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.66 $
+  Date:      $Date: 2007/09/14 08:22:19 $
+  Version:   $Revision: 1.71 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,7 +27,7 @@
 #include <iomanip>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -54,7 +54,7 @@ SeqEntry::SeqEntry( uint16_t group,uint16_t elem )
  */
 SeqEntry::SeqEntry( DocEntry *e, int depth )
              //: DocEntry( e->GetDictEntry() )
-            : DocEntry( e->GetGroup(), e->GetElement(), e->GetVR() )
+            : DocEntry( e->GetGroup(), e->GetElement(), "SQ" /*e->GetVR()*/ )
 {
    Length       = 0;
    ReadLength   = 0xffffffff;
@@ -80,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 dummy, bool dummy2)
 {
    uint16_t seq_term_gr = 0xfffe;
    uint16_t seq_term_el = 0xe0dd;
@@ -89,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
@@ -274,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;