BUG: There was two bombs at the same time. Guess what what I found them all

[gdcm.git] / src / gdcmSeqEntry.cxx

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 11f048daf885dd33cadeb71a15957360d7fcccca..9ba911ee236863df0c045455c90c40b0a668b29a 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/06/20 18:08:48 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/07/02 13:55:28 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,6 @@ gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth)
 }
 
 /**
- * \ingroup gdcmSeqEntry
  * \brief   Canonical destructor.
  */
 gdcmSeqEntry::~gdcmSeqEntry() {
@@ -51,50 +50,68 @@ gdcmSeqEntry::~gdcmSeqEntry() {
       delete seq_term;
 }
 
-//-----------------------------------------------------------------------------
-// Print
 /*
- * \ingroup gdcmSeqEntry
  * \brief   canonical Printer
  */
 void gdcmSeqEntry::Print(std::ostream &os){
 
-   std::ostringstream s,s2;
-   std::string vr;
-   unsigned short int g, e;
-   long lgth;
-   size_t o;    
-   char greltag[10];  //group element tag
-   char st[20]; 
-
    // First, Print the Dicom Element itself.
    SetPrintLevel(2);   
-   PrintCommonPart(os);
-   s << std::endl;
-   os << s.str();   
- 
-    // Then, Print each SQ Item   
-     for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
-   {                           
+   gdcmDocEntry::Print(os);
+   os << std::endl;
+
+   if (GetReadLength() == 0)
+      return;
+
+   // Then, Print each SQ Item   
+   for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
+   {
       (*cc)->Print(os);   
    }
-   // at end, print the sequence terminator item, if any
 
+   // at end, print the sequence terminator item, if any
    if (delimitor_mode) {
-      if (SQDepthLevel>0) {
-         for (int i=0;i<SQDepthLevel;i++)
-            s2 << "   | " ;
-      }                
-      os << s2.str();
+      for (int i=0;i<SQDepthLevel+1;i++)
+         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)
+{
+   uint16_t seq_term_gr = 0xfffe;
+   uint16_t seq_term_el = 0xe0dd;
+   uint32_t seq_term_lg = 0x00000000;
+
+   uint16_t item_term_gr = 0xfffe;
+   uint16_t 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
@@ -110,21 +127,21 @@ void gdcmSeqEntry::SetDepthLevel(int depth) {
    SQDepthLevel = depth;
 }
 
-/// \brief return a pointer to th SQItem referenced by its ordinal number
+/// \brief return a pointer to the SQItem referenced by its ordinal number
 /// (returns the first one if ordinal number is <0
 ///  returns the last  one if ordinal number is > item number
 
 gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) {
    if (nb<0)
-               return (*(items.begin()));
-       int count = 0 ;
+      return (*(items.begin()));
+   int count = 0 ;
    for(ListSQItem::iterator cc = items.begin();
-           cc != items.end();
-                count ++, ++cc){       
+       cc != items.end();
+       count ++, ++cc){
       if (count==nb)
-                  return (*cc);      
+         return *cc;
    }
-       return (*(items.end()));                 
+   return (*(items.end())); // Euhhhhh ?!? Is this the last one . FIXME
 }
 //-----------------------------------------------------------------------------
 // Protected