Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2005/09/06 17:15:25 $
- Version: $Revision: 1.75 $
+ Date: $Date: 2005/10/24 16:00:48 $
+ Version: $Revision: 1.77 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmSQItem.h"
#include "gdcmSeqEntry.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
#include "gdcmGlobal.h"
#include "gdcmDictSet.h"
#include "gdcmUtil.h"
if (DocEntries.empty() )
{
DocEntries.push_back(entry);
+ entry->Register();
return true;
}
break;
} while (it != DocEntries.begin() );
- insertSpot = it++;
- insertSpot++; // ?!?
+ ++it;
+ insertSpot = it;
+ //++insertSpot; // ?!?
DocEntries.insert(insertSpot, entry);
+ entry->Register();
return true;
}
{
DocEntries.erase(it);
gdcmWarningMacro( "One element erased: " << entryToRemove->GetKey() );
- delete entryToRemove;
+ entryToRemove->Unregister();
return true;
}
}
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 removed, no destroyed: "
- << entryToRemove->GetKey() );
- return true;
- }
- }
-
- gdcmWarningMacro( "Entry not found:" << entryToRemove->GetKey() );
- return false ;
-}
-
/**
* \brief Remove all entry in the Sequence Item
*/
cc != DocEntries.end();
++cc)
{
- delete *cc;
+ (*cc)->Unregister();
}
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();
+ source->DocEntries.clear();
}
/**