X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=f418ccd26afa3e83d9783cc3180be7a8008d24c1;hb=709489e13fe8c2b2a3f0cff5b5c948fd516bf855;hp=c589f78cd480606fe49700d3c5240a772c8bbeed;hpb=b1520ca5b7b3665aa40c14b63169bfab92eece55;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index c589f78c..f418ccd2 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/22 13:47:33 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2004/08/27 15:48:44 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,43 +36,50 @@ gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth)
    delimitor_mode = false;
    seq_term  = NULL;
    SQDepthLevel = depth;
+   UsableLength = 0;
+   ReadLength = 0xffffffff;
 }
 
 /**
- * \ingroup gdcmSeqEntry
+ * \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 = depth;
+}
+/**
  * \brief   Canonical destructor.
  */
 gdcmSeqEntry::~gdcmSeqEntry() {
    for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
    {
       delete *cc;
-		cout << "delete SQItem" << endl;
    }
    if (!seq_term)
       delete seq_term;
 }
 
-//-----------------------------------------------------------------------------
-// Print
 /*
- * \ingroup gdcmSeqEntry
  * \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();   
-
-    if (GetReadLength() == 0)
-	    return;
-		  
-    // 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);   
    }
@@ -80,30 +87,44 @@ 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);   
-   }  
+void gdcmSeqEntry::Write(FILE *fp, FileType filetype)
+{
+   uint16_t seq_term_gr = 0xfffe;
+   uint16_t seq_term_el = 0xe0dd;
+   uint32_t seq_term_lg = 0xffffffff;
+
+   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);
+   }
+   
+    //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); 
 }
+
 //-----------------------------------------------------------------------------
 // Public
 
@@ -118,7 +139,7 @@ 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
 
@@ -130,9 +151,9 @@ gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) {
        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