Program: gdcm
Module: $RCSfile: gdcmDocEntryArchive.cxx,v $
Language: C++
- Date: $Date: 2005/06/24 10:55:59 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2007/05/23 14:18:09 $
+ Version: $Revision: 1.19 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <string>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
if ( !newEntry )
return false;
- uint16_t group = newEntry->GetDictEntry()->GetGroup();
- uint16_t elem = newEntry->GetDictEntry()->GetElement();
- std::string key = DictEntry::TranslateToKey(group,elem);
+ //uint16_t group = newEntry->GetDictEntry()->GetGroup();
+ //uint16_t elem = newEntry->GetDictEntry()->GetElement();
+ //TagKey key = DictEntry::TranslateToKey(group,elem);
- if ( Archive.find(key)==Archive.end() )
+ TagKey key = newEntry->GetKey();
+
+ if ( Archive.find(key) == Archive.end() )
{
+ uint16_t group = newEntry->GetGroup();
+ uint16_t elem = newEntry->GetElement();
+
// Save the old DocEntry if any
DocEntry *old = ArchFile->GetDocEntry(group, elem);
Archive[key] = old;
if ( old )
- ArchFile->RemoveEntryNoDestroy(old);
+ {
+ old->Register();
+ ArchFile->RemoveEntry(old);
+ }
// Set the new DocEntry
ArchFile->AddEntry(newEntry);
*/
bool DocEntryArchive::Push(uint16_t group, uint16_t elem)
{
- std::string key = DictEntry::TranslateToKey(group, elem);
-
+ //TagKey key = DictEntry::TranslateToKey(group, elem);
+ TagKey key(group, elem);
if ( Archive.find(key)==Archive.end() )
{
// Save the old DocEntry if any
DocEntry *old = ArchFile->GetDocEntry(group, elem);
Archive[key] = old;
if ( old )
- ArchFile->RemoveEntryNoDestroy(old);
+ {
+ old->Register();
+ ArchFile->RemoveEntry(old);
+ }
return true;
}
*/
bool DocEntryArchive::Restore(uint16_t group, uint16_t elem)
{
- std::string key=DictEntry::TranslateToKey(group, elem);
-
+ //TagKey key=DictEntry::TranslateToKey(group, elem);
+ TagKey key(group, elem);
TagDocEntryHT::iterator restoreIt=Archive.find(key);
if ( restoreIt!=Archive.end() )
{
// Delete the new value
DocEntry *rem = ArchFile->GetDocEntry(group, elem);
if ( rem )
+ {
ArchFile->RemoveEntry(rem);
+ }
// Restore the old value
- if ( Archive[key] )
- ArchFile->AddEntry(Archive[key]);
+ if ( restoreIt->second )
+ {
+ ArchFile->AddEntry(restoreIt->second);
+ restoreIt->second->Unregister();
+ }
Archive.erase(restoreIt);
it!=Archive.end();
++it)
{
- delete it->second;
+ if(it->second)
+ it->second->Unregister();
}
Archive.clear();
}