Fix mistypings

[gdcm.git] / src / gdcmSeqEntry.cxx

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 615863efca6b641a4438396a97bb3b5d27d349a4..7b047295c3205a8fdd7190561e10987e32d0ba23 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: 2005/10/25 14:52:35 $
-  Version:   $Revision: 1.60 $
+  Date:      $Date: 2007/10/08 15:20:17 $
+  Version:   $Revision: 1.72 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,15 +27,17 @@
 #include <iomanip>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
+// Constructor / Destructor
+
 // Constructor / Destructor
 /**
  * \brief   Constructor from a given SeqEntry
  */
-SeqEntry::SeqEntry( DictEntry *e ) 
-             : DocEntry(e)
+SeqEntry::SeqEntry( uint16_t group,uint16_t elem ) 
+             : DocEntry(group, elem, "SQ")
 {
    Length       = 0;
    ReadLength   = 0xffffffff;
@@ -51,7 +53,8 @@ SeqEntry::SeqEntry( DictEntry *e )
  * @param   depth depth level of the current Seq entry
  */
 SeqEntry::SeqEntry( DocEntry *e, int depth )
-             : DocEntry( e->GetDictEntry() )
+             //: DocEntry( e->GetDictEntry() )
+            : DocEntry( e->GetGroup(), e->GetElement(), "SQ" /*e->GetVR()*/ )
 {
    Length       = 0;
    ReadLength   = 0xffffffff;
@@ -77,21 +80,23 @@ SeqEntry::~SeqEntry()
  * @param fp pointer to an already open file
  * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  */
-void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype)
+void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype, bool , bool )
 {
    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;
-   
-   DocEntry::WriteContent(fp, filetype);
+   uint32_t seq_term_lg = 0x00000000;
+ 
+   // ignore 'Zero length' Sequences
+   if ( GetReadLength() == 0 )
+      return;
+   // false : we are not in MetaElements
+   // true : we are inside a Sequence
+   DocEntry::WriteContent(fp, filetype, false, true);
    for(ListSQItem::iterator cc  = Items.begin();
                             cc != Items.end();
                           ++cc)
-   {        
-      (*cc)->WriteContent(fp, filetype);
+   {   
+      (*cc)->WriteContent(fp, filetype, false, true);
    }
    
    // we force the writting of a Sequence Delimitation item
@@ -101,6 +106,23 @@ void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write(*fp, seq_term_lg);
 }
 
+/**
+ * \brief   Compute the full length of the SeqEntry (not only value
+ *          length) depending on the VR.
+ */
+uint32_t SeqEntry::ComputeFullLength()
+{
+   uint32_t l = 12; // Tag (4) + VR (explicit) 4 + 4 (length);   
+   for(ListSQItem::iterator cc  = Items.begin();
+                            cc != Items.end();
+                          ++cc)
+   {        
+      l += (*cc)->ComputeFullLength();
+   }   
+   l += 8; // seq_term Tag (4) +  seq_term_lg (4)
+   return l;
+}
+
 /**
  * \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.
  * @param sqItem SQItem to be pushed back in the SeqEntry
@@ -212,10 +234,37 @@ void SeqEntry::SetDelimitationItem(DocEntry *e)
    }
 }
 
+/**
+ * \brief Copies all the attributes from an other DocEntry 
+ * @param doc entry to copy from
+ * @remarks The contained SQItems a not copied, only referenced
+ */
+void SeqEntry::Copy(DocEntry *doc)
+{
+   // Delete previous SQ items
+   ClearSQItem();
+
+   DocEntry::Copy(doc);
+   SeqEntry *entry = dynamic_cast<SeqEntry *>(doc);
+   if ( entry )
+   {
+      DelimitorMode = entry->DelimitorMode;
+      SQDepthLevel = entry->SQDepthLevel;
+
+      SeqTerm = entry->SeqTerm;
+      if(SeqTerm)
+         SeqTerm->Register();
+      Items = entry->Items;
+      for(ItSQItem = Items.begin();ItSQItem != Items.end(); ++ItSQItem)
+      {
+         (*ItSQItem)->Register();
+      }
+   }
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
-
 //-----------------------------------------------------------------------------
 // Private
 
@@ -226,8 +275,9 @@ void SeqEntry::SetDelimitationItem(DocEntry *e)
  */
 void SeqEntry::Print( std::ostream &os, std::string const & )
 {
-   // First, Print the Dicom Element itself.
-   os << "S ";
+   // os << "S ";
+   
+   // First, Print the common part (vr [length offset] name).
    DocEntry::Print(os);
    os << std::endl;