X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=9f26de3bc1dacbbbdbc47fe61db258870985f850;hb=56a8ed8f761ffe0b37da6c3310dadee80333d689;hp=431ac51e1702320ba439dc4557effbe70d50d815;hpb=af288a85afcf018ea938b95dc5c87284ee9b83d6;p=gdcm.git

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 431ac51e..9f26de3b 100644
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/07 09:46:37 $
-  Version:   $Revision: 1.79 $
+  Date:      $Date: 2005/12/13 09:22:05 $
+  Version:   $Revision: 1.83 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -58,10 +58,10 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
 {
    int j;
    uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff };
-   uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff };
+   uint16_t itemt[4]= { 0xfffe, 0xe00d, 0x0000, 0x0000 };
 
     //we force the writting of an 'Item' Start Element
-    // because we want to write the Item as a 'no Length' item
+    // because we want to write the Item as a 'No Length' item
    for(j=0;j<4;++j)
    {
       binary_write( *fp, item[j]);  // fffe e000 ffff ffff 
@@ -95,13 +95,13 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
     // because we wrote the Item as a 'no Length' item
    for(j=0;j<4;++j)
    {
-      binary_write( *fp, itemt[j]);  // fffe e000 ffff ffff 
+      binary_write( *fp, itemt[j]);  // fffe e000 0000 0000 
    } 
 }
 
 /**
- * \brief   Compute the full length of the SQItem (not only value
- *          length) depending on the VR.
+ * \brief   Compute the full length of the SQItem (not only value length)
+ *           depending on the VR.
  */
 uint32_t SQItem::ComputeFullLength()
 {
@@ -157,7 +157,6 @@ bool SQItem::AddEntry(DocEntry *entry)
   
    ++it;
    insertSpot = it;
-   //++insertSpot; // ?!?
    DocEntries.insert(insertSpot, entry); 
    entry->Register();
    return true;
@@ -200,15 +199,6 @@ void SQItem::ClearEntry()
    DocEntries.clear();
 }
 
-/**
- * \brief  Move all the entries from a given Sequence Item 
- */
-void SQItem::MoveObject(SQItem *source)
-{
-   DocEntries = source->DocEntries;
-   source->DocEntries.clear();
-}
-
 /**
  * \brief   Get the first Dicom entry while visiting the SQItem
  * \return  The first DocEntry if found, otherwhise 0
@@ -251,6 +241,30 @@ DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem)
    return NULL;
 }
 
+/**
+ * \brief Copies all the attributes from an other DocEntrySet 
+ * @param set entry to copy from
+ * @remarks The contained DocEntries a not copied, only referenced
+ */
+void SQItem::Copy(DocEntrySet *set)
+{
+   // Remove all previous entries
+   ClearEntry();
+
+   DocEntrySet::Copy(set);
+
+   SQItem *sq = dynamic_cast<SQItem *>(set);
+   if( sq )
+   {
+      SQDepthLevel = sq->SQDepthLevel;
+      SQItemNumber = sq->SQItemNumber;
+
+      DocEntries = sq->DocEntries;
+      for(ItDocEntries = DocEntries.begin();ItDocEntries != DocEntries.end();++ItDocEntries)
+         (*ItDocEntries)->Register();
+   }
+}
+
 //-----------------------------------------------------------------------------
 // Protected