X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=8a796aac73329ef459037449b138285a16aee393;hb=0bcc188c6d5185375f809253e8b9b97c856d2eac;hp=e6b4e1c9cf145dd40fac7e17992e80063d91d2cd;hpb=5b89bede4607999aeb8d5b45311e7ee82f9471ef;p=gdcm.git

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index e6b4e1c9..8a796aac 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/02/02 16:18:48 $
-  Version:   $Revision: 1.66 $
+  Date:      $Date: 2007/08/29 15:30:49 $
+  Version:   $Revision: 1.87 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,8 +18,6 @@
 
 #include "gdcmSQItem.h"
 #include "gdcmSeqEntry.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
 #include "gdcmGlobal.h"
 #include "gdcmDictSet.h"
 #include "gdcmUtil.h"
@@ -27,7 +25,7 @@
 
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -56,14 +54,15 @@ SQItem::~SQItem()
  * @param fp     file pointer to an already open file. 
  * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  */
-void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
+void SQItem::WriteContent(std::ofstream *fp, FileType filetype, 
+                               bool insideMetaElements, bool dummy2)
 {
    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 
@@ -85,30 +84,58 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
       // we just *always* ignore spurious fffe|0000 tag ! 
       if ( (*it)->GetGroup() == 0xfffe && (*it)->GetElement() == 0x0000 )
       {
-         break; // FIXME : continue; ?!?
+          break; // FIXME : break or continue; ?!?  
+                 // --> makes no difference since the only bugged file we have
+                 // contains 'impossible tag' fffe|0000 in last position !                            
       }
-
-      (*it)->WriteContent(fp, filetype);
+      // false : we are not in MetaElements
+      // true  : we are inside a Sequence
+      (*it)->WriteContent(fp, filetype, false, true);
    }
       
     //we force the writting of an 'Item Delimitation' item
     // 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.
+ */
+uint32_t SQItem::ComputeFullLength()
+{
+   uint32_t l = 8;  // Item Starter length
+   for (ListDocEntry::iterator it = DocEntries.begin();  
+                               it != DocEntries.end();
+                             ++it)
+   {   
+      // we skip delimitors (start and end one) because 
+      // we force them as 'no length'
+      if ( (*it)->GetGroup() == 0xfffe )
+      {
+         continue;
+      }
+      l += (*it)->ComputeFullLength();
+   }
+   l += 8; // 'Item Delimitation' item 
+   return l;  
+}
+
 /**
  * \brief   Inserts *in the right place* any Entry (Dicom Element)
  *          into the Sequence Item
  * @param entry Entry to add
+ * @return always true 
  */
 bool SQItem::AddEntry(DocEntry *entry)
 {   
    if (DocEntries.empty() )
    {
       DocEntries.push_back(entry);
+      entry->Register();
       return true;
    }
  
@@ -130,9 +157,10 @@ bool SQItem::AddEntry(DocEntry *entry)
             break;
    } while (it != DocEntries.begin() );
   
-   insertSpot = it++;
-   insertSpot++; // ?!?
+   ++it;
+   insertSpot = it;
    DocEntries.insert(insertSpot, entry); 
+   entry->Register();
    return true;
 }   
 
@@ -147,42 +175,18 @@ bool SQItem::RemoveEntry( DocEntry *entryToRemove )
                               it != DocEntries.end();
                             ++it)
    {
-      if( *it == entryToRemove )
+      if ( *it == entryToRemove )
       {
          DocEntries.erase(it);
-         gdcmVerboseMacro( "One element erased: " << entryToRemove->GetKey() );
-         delete entryToRemove;
+         gdcmDebugMacro( "One element erased: " << entryToRemove->GetKey() );
+         entryToRemove->Unregister();
          return true;
       }
    }
-   gdcmVerboseMacro( "Entry not found: " << entryToRemove->GetKey() );
+   gdcmWarningMacro( "Entry not found: " << entryToRemove->GetKey() );
    return false ;
 }
 
-/**
- * \brief   Clear the std::list from given entry BUT keep the entry.
- * @param   entryToRemove Entry to remove.
- * @return true if the entry was found and removed; false otherwise
- */
-bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove)
-{
-   for(ListDocEntry::iterator it =  DocEntries.begin();
-                              it != DocEntries.end();
-                            ++it)
-   {
-      if( *it == entryToRemove )
-      {
-         DocEntries.erase(it);
-         gdcmVerboseMacro( "One element erased, no destroyed: "
-                            << entryToRemove->GetKey() );
-         return true;
-      }
-   }
-                                                                                
-   gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() );
-   return false ;
-}
-                                                                                
 /**
  * \brief  Remove all entry in the Sequence Item 
  */
@@ -192,7 +196,7 @@ void SQItem::ClearEntry()
                               cc != DocEntries.end();
                             ++cc)
    {
-      delete *cc;
+      (*cc)->Unregister();
    }
    DocEntries.clear();
 }
@@ -204,19 +208,19 @@ void SQItem::ClearEntry()
 DocEntry *SQItem::GetFirstEntry()
 {
    ItDocEntries = DocEntries.begin();
-   if( ItDocEntries != DocEntries.end() )
+   if ( ItDocEntries != DocEntries.end() )
       return *ItDocEntries;
    return 0;   
 }
                                                                                 
 /**
- * \brief   Get the next Dicom entry while visiting the chained list
+ * \brief   Get the next Dicom entry while visiting the SQItem
  * \return  The next DocEntry if found, otherwhise NULL
  */
 DocEntry *SQItem::GetNextEntry()
 {
    ++ItDocEntries;
-   if( ItDocEntries != DocEntries.end() )
+   if ( ItDocEntries != DocEntries.end() )
       return  *ItDocEntries;
    return NULL;
 }
@@ -239,6 +243,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