X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=1dff9cd878cf60e9fe10554fe5152aa672376fff;hb=25b8b1283cdf4cbf91bf60be75ccced82e6bcc95;hp=7316a268b2f8e512c849281b91e9af3aeb295a40;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 7316a268..1dff9cd8 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/05 01:37:09 $
-  Version:   $Revision: 1.69 $
+  Date:      $Date: 2005/10/27 09:52:33 $
+  Version:   $Revision: 1.78 $
   
   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"
@@ -85,7 +83,9 @@ 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);
@@ -103,12 +103,14 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
  * \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 +132,11 @@ bool SQItem::AddEntry(DocEntry *entry)
             break;
    } while (it != DocEntries.begin() );
   
-   insertSpot = it++;
-   insertSpot++; // ?!?
+   ++it;
+   insertSpot = it;
+   //++insertSpot; // ?!?
    DocEntries.insert(insertSpot, entry); 
+   entry->Register();
    return true;
 }   
 
@@ -147,11 +151,11 @@ bool SQItem::RemoveEntry( DocEntry *entryToRemove )
                               it != DocEntries.end();
                             ++it)
    {
-      if( *it == entryToRemove )
+      if ( *it == entryToRemove )
       {
          DocEntries.erase(it);
-         gdcmWarningMacro( "One element erased: " << entryToRemove->GetKey() );
-         delete entryToRemove;
+         gdcmDebugMacro( "One element erased: " << entryToRemove->GetKey() );
+         entryToRemove->Unregister();
          return true;
       }
    }
@@ -159,30 +163,6 @@ bool SQItem::RemoveEntry( DocEntry *entryToRemove )
    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);
-         gdcmWarningMacro( "One element erased, no destroyed: "
-                            << entryToRemove->GetKey() );
-         return true;
-      }
-   }
-                                                                                
-   gdcmWarningMacro( "Entry not found:" << entryToRemove->GetKey() );
-   return false ;
-}
-                                                                                
 /**
  * \brief  Remove all entry in the Sequence Item 
  */
@@ -192,11 +172,20 @@ void SQItem::ClearEntry()
                               cc != DocEntries.end();
                             ++cc)
    {
-      delete *cc;
+      (*cc)->Unregister();
    }
    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
@@ -204,7 +193,7 @@ void SQItem::ClearEntry()
 DocEntry *SQItem::GetFirstEntry()
 {
    ItDocEntries = DocEntries.begin();
-   if( ItDocEntries != DocEntries.end() )
+   if ( ItDocEntries != DocEntries.end() )
       return *ItDocEntries;
    return 0;   
 }
@@ -216,47 +205,11 @@ DocEntry *SQItem::GetFirstEntry()
 DocEntry *SQItem::GetNextEntry()
 {
    ++ItDocEntries;
-   if( ItDocEntries != DocEntries.end() )
+   if ( ItDocEntries != DocEntries.end() )
       return  *ItDocEntries;
    return NULL;
 }
 
-/**
- * \brief   Get the first ValEntry while visiting theSQItem
- *              This method is designed for Python users
- * \return  The first ValEntry if found, otherwhise NULL
- */
-ValEntry *SQItem::GetFirstValEntry()
-{
-   gdcm::ValEntry *valEntry;
-   gdcm::DocEntry *d = GetFirstEntry();
-   // an other iterator is needed to allow user iterate 
-   // at the same time both on DocEntries and ValEntries 
-   ItValEntries = ItDocEntries;
-   if ( (valEntry = dynamic_cast<gdcm::ValEntry*>(d)))
-      return valEntry;
-   return  GetNextValEntry();
-}
-                                                                                
-/**
- * \brief   Get the next ValEntry while visiting the SQItem
- * \return  The next ValEntry if found, otherwhise NULL
- */
-ValEntry *SQItem::GetNextValEntry()
-{
-   gdcm::ValEntry *valEntry;
-   gdcm::DocEntry *d = *ItValEntries;
-   ++ItValEntries; 
-   while( d )
-   {
-      if ( (valEntry = dynamic_cast<gdcm::ValEntry*>(d)))
-         return valEntry;
-      else
-     return GetNextValEntry(); 
-   }
-   return 0;
-}
-
 /**
  * \brief   Gets a Dicom Element inside a SQ Item Entry
  * @param   group   Group number of the Entry