X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=1dff9cd878cf60e9fe10554fe5152aa672376fff;hb=da0bfa12abf63a06edc9d06d88ea0d3164fec1db;hp=3180df8a39e0fe853f08ee3a331d24d18e09a98e;hpb=d1c68c2c2ae9fadf927053150f7fbc625a7c7366;p=gdcm.git

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 3180df8a..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/01 10:29:56 $
-  Version:   $Revision: 1.64 $
+  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"
@@ -70,7 +68,7 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
    }
      
    for (ListDocEntry::iterator it = DocEntries.begin();  
-                              it != DocEntries.end();
+                               it != DocEntries.end();
                              ++it)
    {   
       // we skip delimitors (start and end one) because 
@@ -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);
@@ -96,31 +96,47 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
    for(j=0;j<4;++j)
    {
       binary_write( *fp, itemt[j]);  // fffe e000 ffff ffff 
-   }
- 
+   } 
 }
 
 /**
- * \brief  Remove all entry in the Sequence Item 
+ * \brief   Inserts *in the right place* any Entry (Dicom Element)
+ *          into the Sequence Item
+ * @param entry Entry to add
+ * @return always true 
  */
-void SQItem::ClearEntry()
-{
-   for(ListDocEntry::iterator cc = DocEntries.begin();
-                             cc != DocEntries.end();
-                             ++cc)
+bool SQItem::AddEntry(DocEntry *entry)
+{   
+   if (DocEntries.empty() )
    {
-      delete *cc;
+      DocEntries.push_back(entry);
+      entry->Register();
+      return true;
    }
-   DocEntries.clear();
-}
+ 
+   ListDocEntry::iterator insertSpot;
+   ListDocEntry::iterator it = DocEntries.end();
+   do
+   {
+      it--;
 
-/**
- * \brief   Adds any Entry (Dicom Element) to the Sequence Item
- * @param entry Entry to add
- */
-bool SQItem::AddEntry(DocEntry *entry)
-{
-   DocEntries.push_back(entry);
+      if ( (*it)->IsItemDelimitor() )
+      {
+         continue;
+      }
+      if ( (*it)->GetGroup() < entry->GetGroup() )
+         break;
+      else
+         if ( (*it)->GetGroup() == entry->GetGroup() &&
+              (*it)->GetElement() < entry->GetElement() )
+            break;
+   } while (it != DocEntries.begin() );
+  
+   ++it;
+   insertSpot = it;
+   //++insertSpot; // ?!?
+   DocEntries.insert(insertSpot, entry); 
+   entry->Register();
    return true;
 }   
 
@@ -129,48 +145,47 @@ bool SQItem::AddEntry(DocEntry *entry)
  * @param   entryToRemove Entry to remove AND delete.
  * @return true if the entry was found and removed; false otherwise
  */
-bool SQItem::RemoveEntry( DocEntry *entryToRemove)
+bool SQItem::RemoveEntry( DocEntry *entryToRemove )
 {
    for(ListDocEntry::iterator it = DocEntries.begin();
-       it != DocEntries.end();
-       ++it)
+                              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
+ * \brief  Remove all entry in the Sequence Item 
  */
-bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove)
+void SQItem::ClearEntry()
 {
-   for(ListDocEntry::iterator it = DocEntries.begin();
-       it != DocEntries.end();
-       ++it)
+   for(ListDocEntry::iterator cc = DocEntries.begin();
+                              cc != DocEntries.end();
+                            ++cc)
    {
-      if( *it == entryToRemove)
-      {
-         DocEntries.erase(it);
-         gdcmVerboseMacro( "One element erased, no destroyed: "
-                            << entryToRemove->GetKey() );
-         return true;
-      }
+      (*cc)->Unregister();
    }
-                                                                                
-   gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() );
-   return false ;
+   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
@@ -178,19 +193,19 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove)
 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;
 }
@@ -203,8 +218,9 @@ DocEntry *SQItem::GetNextEntry()
  */
 DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem)
 {
-   for(ListDocEntry::iterator i = DocEntries.begin();
-                              i != DocEntries.end(); ++i)
+   for(ListDocEntry::iterator i =  DocEntries.begin();
+                              i != DocEntries.end(); 
+                            ++i)
    {
       if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem )
          return *i;