X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src%2FgdcmSeqEntry.cxx;h=fd4d24993c019c7183da9ac5997c1bfa3df3eb66;hb=05f9a9731209a5c98895a57c6abca609f8e9b312;hp=94b3f9bcc670fc61e93fc1ab26b1ce6a01f54179;hpb=19f72d139faa0f6a03f4e4a33be4c6b3e70b18b7;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 94b3f9bc..fd4d2499 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/06/23 03:36:24 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/06/24 18:03:14 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,39 +39,32 @@ gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth)
 }
 
 /**
- * \ingroup gdcmSeqEntry
  * \brief   Canonical destructor.
  */
 gdcmSeqEntry::~gdcmSeqEntry() {
    for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
    {
       delete *cc;
-     std::cout << "delete SQItem" <<std:: endl;
    }
    if (!seq_term)
       delete seq_term;
 }
 
-//-----------------------------------------------------------------------------
-// Print
 /*
  * \brief   canonical Printer
  */
 void gdcmSeqEntry::Print(std::ostream &os){
 
-   std::ostringstream s,s2;
-   std::string vr;
    // First, Print the Dicom Element itself.
    SetPrintLevel(2);   
-   PrintCommonPart(os);
-   s << std::endl;
-   os << s.str();   
+   gdcmDocEntry::Print(os);
+   os << std::endl;
 
-    if (GetReadLength() == 0)
-       return;
+   if (GetReadLength() == 0)
+      return;
 
-    // Then, Print each SQ Item   
-     for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
+   // Then, Print each SQ Item   
+   for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
    {
       (*cc)->Print(os);   
    }
@@ -79,30 +72,47 @@ void gdcmSeqEntry::Print(std::ostream &os){
    // at end, print the sequence terminator item, if any
    if (delimitor_mode) {
       for (int i=0;i<SQDepthLevel+1;i++)
-         s2 << "   | " ;
-      os << s2.str();
+         os << "   | " ;
       if (seq_term != NULL) {
          seq_term->Print(os);
+         os << std::endl;
       } 
       else 
-         std::cout
-             << "      -------------- should have a sequence terminator item"
-             << std::endl;      
+         // fusible
+         os << "      -------------- should have a sequence terminator item";
    }                    
- }
-
+}
 
 /*
  * \brief   canonical Writer
  */
-void gdcmSeqEntry::Write(FILE *fp, FileType filetype) {
-  for(ListSQItem::iterator cc  = GetSQItems().begin();
-                           cc != GetSQItems().end();
-                         ++cc) {
-      std::cout << "Et un SQItem !" << std::endl;
-      (*cc)->Write(fp, filetype);  // Don't remove param filetype !
-   }  
+void gdcmSeqEntry::Write(FILE *fp, FileType filetype)
+{
+   guint16 seq_term_gr = 0xfffe;
+   guint16 seq_term_el = 0xe0dd;
+   guint32 seq_term_lg = 0x00000000;
+
+   guint16 item_term_gr = 0xfffe;
+   guint16 item_term_el = 0xe00d;
+
+   gdcmDocEntry::Write(fp, filetype);
+   for(ListSQItem::iterator cc  = GetSQItems().begin();
+                            cc != GetSQItems().end();
+                          ++cc)
+   {
+      (*cc)->Write(fp, filetype);
+
+   fwrite ( &item_term_gr,(size_t)2 ,(size_t)1 ,fp);
+   fwrite ( &item_term_el,(size_t)2 ,(size_t)1 ,fp);   
+   fwrite ( &seq_term_lg,(size_t)4 ,(size_t)1 ,fp); 
+   }
+    //we force the writting of a Sequence Delimitaion item
+    // because we wrote the Sequence as a 'no Length' sequence
+   fwrite ( &seq_term_gr,(size_t)2 ,(size_t)1 ,fp);
+   fwrite ( &seq_term_el,(size_t)2 ,(size_t)1 ,fp);
+   fwrite ( &seq_term_lg,(size_t)4 ,(size_t)1 ,fp); 
 }
+
 //-----------------------------------------------------------------------------
 // Public