X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=fe331d2b6bed66fefafb9f34c7967f399b0f0ff5;hb=34e322ceb4e12797e6d4cb1e691a36425015d2e0;hp=2ec7540d0a693640567e4c08386c01163787aaa8;hpb=0416947420d9168401c99e7fbf0dca0a081c9175;p=gdcm.git

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 2ec7540d..fe331d2b 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/07 08:48:18 $
-  Version:   $Revision: 1.70 $
+  Date:      $Date: 2005/07/12 17:08:12 $
+  Version:   $Revision: 1.74 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -103,6 +103,7 @@ 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)
 {   
@@ -147,7 +148,7 @@ bool SQItem::RemoveEntry( DocEntry *entryToRemove )
                               it != DocEntries.end();
                             ++it)
    {
-      if( *it == entryToRemove )
+      if ( *it == entryToRemove )
       {
          DocEntries.erase(it);
          gdcmWarningMacro( "One element erased: " << entryToRemove->GetKey() );
@@ -170,10 +171,10 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove)
                               it != DocEntries.end();
                             ++it)
    {
-      if( *it == entryToRemove )
+      if ( *it == entryToRemove )
       {
          DocEntries.erase(it);
-         gdcmWarningMacro( "One element erased, no destroyed: "
+         gdcmWarningMacro( "One element removed, no destroyed: "
                             << entryToRemove->GetKey() );
          return true;
       }
@@ -197,6 +198,24 @@ void SQItem::ClearEntry()
    DocEntries.clear();
 }
 
+/**
+ * \brief  Clear the std::list from given Sequence Item  BUT keep the entries
+ */
+void SQItem::ClearEntryNoDestroy()
+{
+   DocEntries.clear();
+}
+
+
+/**
+ * \brief  Move all the entries from a given Sequence Item 
+ */
+void SQItem::MoveObject(SQItem *source)
+{
+   DocEntries = source->DocEntries;
+   source->ClearEntryNoDestroy();
+}
+
 /**
  * \brief   Get the first Dicom entry while visiting the SQItem
  * \return  The first DocEntry if found, otherwhise 0
@@ -204,7 +223,7 @@ void SQItem::ClearEntry()
 DocEntry *SQItem::GetFirstEntry()
 {
    ItDocEntries = DocEntries.begin();
-   if( ItDocEntries != DocEntries.end() )
+   if ( ItDocEntries != DocEntries.end() )
       return *ItDocEntries;
    return 0;   
 }
@@ -216,7 +235,7 @@ DocEntry *SQItem::GetFirstEntry()
 DocEntry *SQItem::GetNextEntry()
 {
    ++ItDocEntries;
-   if( ItDocEntries != DocEntries.end() )
+   if ( ItDocEntries != DocEntries.end() )
       return  *ItDocEntries;
    return NULL;
 }