X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=4323f941cdc8212189debeb83d2fd7c17575f786;hb=c460dc75a10d96fc38011db90fae5bcd8649b743;hp=6026a867e9b6187746f41fdf49450b7b2355ed2a;hpb=65f457a97152fce4878d7aa20ec02f4ccda20705;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 6026a867..4323f941 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 15:01:57 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/09/16 19:21:57 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,12 +30,31 @@
  * \ingroup gdcmSeqEntry
  * \brief   Constructor from a given gdcmSeqEntry
  */
-gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth) 
+gdcmSeqEntry::gdcmSeqEntry( gdcmDictEntry* e ) 
              : gdcmDocEntry(e)
 {
+   UsableLength = 0;
+   ReadLength = 0xffffffff;
+   SQDepthLevel = -1;
+
    delimitor_mode = false;
    seq_term  = NULL;
+}
+
+/**
+ * \brief   Constructor from a given gdcmSeqEntry
+ * @param   e Pointer to existing Doc entry
+ * @param   depth depth level of the current Seq entry
+  */
+gdcmSeqEntry::gdcmSeqEntry( gdcmDocEntry* e, int depth )
+             : gdcmDocEntry( e->GetDictEntry() )
+{
+   this->UsableLength = 0;
+   this->ReadLength   = 0xffffffff;
    SQDepthLevel = depth;
+
+   this->ImplicitVR   = e->IsImplicitVR();
+   this->Offset       = e->GetOffset();
 }
 
 /**
@@ -45,17 +64,16 @@ 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;
 }
 
-/*
+/**
  * \brief   canonical Printer
  */
-void gdcmSeqEntry::Print(std::ostream &os){
-
+void gdcmSeqEntry::Print( std::ostream &os )
+{
    // First, Print the Dicom Element itself.
    SetPrintLevel(2);   
    gdcmDocEntry::Print(os);
@@ -72,14 +90,20 @@ 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++)
+      for ( int i = 0; i < SQDepthLevel; i++ )
+      {
          os << "   | " ;
-      if (seq_term != NULL) {
+      }
+      if (seq_term != NULL)
+      {
          seq_term->Print(os);
          os << std::endl;
       } 
       else 
+      {
+         // fuse
          os << "      -------------- should have a sequence terminator item";
+      }
    }                    
 }
 
@@ -88,34 +112,46 @@ 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 = 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);   
-   }  
+   {        
+      (*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
 
- /// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.      
-void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem, int itemNumber) {
+/// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.
+void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem, int itemNumber)
+{
    sqItem->SetSQItemNumber(itemNumber);
    items.push_back(sqItem);
 }
 
-/// \brief Sets the depth level of a Sequence Entry embedded in a SeQuence 
-void gdcmSeqEntry::SetDepthLevel(int depth) {
-   SQDepthLevel = depth;
-}
-
-/// \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) {
+/**
+ * \brief return a pointer to the SQItem referenced by its ordinal number.
+ *        Returns the first item when argument is negative.
+ *        Returns the last item when argument is bigget than the total
+ *        item number.
+ */
+gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb)
+{
    if (nb<0)
       return (*(items.begin()));
    int count = 0 ;