X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=dd5c582abe4c58dd25022703f9e4fa3ed3af3359;hb=c2975ffb8c79fa4d745368d8d1c317c5a313dd0a;hp=11033cdbab0e9bb284ac21db73f06a5354710864;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 11033cdb..dd5c582a 100644
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/05 01:37:09 $
-  Version:   $Revision: 1.54 $
+  Date:      $Date: 2005/11/29 12:48:47 $
+  Version:   $Revision: 1.63 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -46,7 +46,7 @@ SeqEntry::SeqEntry( DictEntry *e )
 }
 
 /**
- * \brief   Constructor from a given SeqEntry
+ * \brief   Constructor from a given DocEntry
  * @param   e Pointer to existing Doc entry
  * @param   depth depth level of the current Seq entry
  */
@@ -82,10 +82,11 @@ void SeqEntry::WriteContent(std::ofstream *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;
-   
+ 
+   // ignore 'Zero length' Sequences
+   if ( GetReadLength() == 0 )
+      return;
+       
    DocEntry::WriteContent(fp, filetype);
    for(ListSQItem::iterator cc  = Items.begin();
                             cc != Items.end();
@@ -101,6 +102,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
@@ -116,6 +134,7 @@ void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber)
 //         Or we can add (or remove) anywhere, and SQItemNumber will be broken
    sqItem->SetSQItemNumber(itemNumber);
    Items.push_back(sqItem);
+   sqItem->Register();
 }
 
 /**
@@ -125,11 +144,11 @@ void SeqEntry::ClearSQItem()
 {
    for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
    {
-      delete *cc;
+      (*cc)->Unregister();
    }
    if (SeqTerm)
    {
-      delete SeqTerm;
+      SeqTerm->Unregister();
    }
 }
 
@@ -195,10 +214,53 @@ unsigned int SeqEntry::GetNumberOfSQItems()
    return Items.size();
 }
 
+/**
+ * \brief Sets the Sequence Delimitation Item
+ * \param e Delimitation item
+ */
+void SeqEntry::SetDelimitationItem(DocEntry *e)
+{
+   if( SeqTerm != e )
+   {
+      if( SeqTerm )
+         SeqTerm->Unregister();
+      SeqTerm = e;
+      if( SeqTerm )
+         SeqTerm->Register();
+   }
+}
+
+/**
+ * \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
 
@@ -227,10 +289,12 @@ void SeqEntry::Print( std::ostream &os, std::string const & )
    // at end, print the sequence terminator item, if any
    if (DelimitorMode)
    {
-      for ( int i = 0; i < SQDepthLevel; i++ )
-      {
+      int i;
+      for ( i = 0; i < SQDepthLevel; i++ )
+         os << "   | " ;
+      os << " --- "  << std::endl;
+      for ( i = 0; i < SQDepthLevel; i++ )
          os << "   | " ;
-      }
       if (SeqTerm != NULL)
       {
          SeqTerm->SetPrintLevel(PrintLevel);