- now, DicomDir stuff stakes into account the 'new' structure

[gdcm.git] / src / gdcmSeqEntry.cxx

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index a42f7f1670f0384083fa684a6191080f752c937a..5ee43c7754ac1272155b85ad50b53278fc31a865 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/23 13:02:36 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2004/08/26 15:29:53 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,8 +36,23 @@ gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth)
    delimitor_mode = false;
    seq_term  = NULL;
    SQDepthLevel = depth;
+   UsableLength = 0;
+   ReadLength = 0xffffffff;
 }
 
+/**
+ * \brief   Constructor from a given gdcmSeqEntry
+ * @param   e Pointer to existing Doc entry
+ */
+gdcmSeqEntry::gdcmSeqEntry(gdcmDocEntry* e, int depth) : gdcmDocEntry(e->GetDictEntry())
+{
+   this->UsableLength = 0;
+   this->ReadLength   = 0xffffffff;
+   this->ImplicitVR   = e->IsImplicitVR();
+   this->Offset       = e->GetOffset();
+   //this->printLevel   = e->GetPrintLevel(); // no longer exists ?!?
+   this->SQDepthLevel = e->GetDepthLevel();
+}
 /**
  * \brief   Canonical destructor.
  */
@@ -45,7 +60,6 @@ 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;
@@ -76,8 +90,10 @@ void gdcmSeqEntry::Print(std::ostream &os){
          os << "   | " ;
       if (seq_term != NULL) {
          seq_term->Print(os);
+         os << std::endl;
       } 
       else 
+         // fusible
          os << "      -------------- should have a sequence terminator item";
    }                    
 }
@@ -87,13 +103,32 @@ void gdcmSeqEntry::Print(std::ostream &os){
  */
 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);   
-   }  
+      (*cc)->Write(fp, filetype);
+      
+    //we force the writting of an Item Delimitation item
+    // because we wrote the Item as a 'no Length' item
+      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); // Heu .....
+   }
+   
+    //we force the writting of a Sequence Delimitation 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); 
 }
 
 //-----------------------------------------------------------------------------