Program: gdcm
Module: $RCSfile: gdcmDocEntryArchive.cxx,v $
Language: C++
- Date: $Date: 2005/02/17 11:03:32 $
- Version: $Revision: 1.12 $
+ 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
* \brief Replaces in the Header a DocEntry by the new DocEntry.
* The initial DocEntry is kept in archive.
* @param newEntry New entry to substitute to an other entry of the Header
- * @return FALSE when an other DocEntry is already archived
- * with the same key, TRUE otherwise
+ * @return FALSE when an other DocEntry is already archived with the same key
+ * TRUE otherwise
*/
bool DocEntryArchive::Push(DocEntry *newEntry)
{
- if(!newEntry)
+ 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);
+ DocEntry *old = ArchFile->GetDocEntry(group, elem);
Archive[key] = old;
- if( old )
- ArchFile->RemoveEntryNoDestroy(old);
+ if ( old )
+ {
+ old->Register();
+ ArchFile->RemoveEntry(old);
+ }
// Set the new DocEntry
ArchFile->AddEntry(newEntry);
/**
* \brief Removes out of the Header a DocEntry.
- * It's kept in archive.
+ * (it's kept in archive).
* @param group Group number of the Entry to remove
* @param elem Element number of the Entry to remove
- * @return FALSE when an other DocEntry is already archived
- * with the same key, TRUE otherwise
+ * @return FALSE when an other DocEntry is already archived with the same key
+ * TRUE otherwise
*/
-bool DocEntryArchive::Push(uint16_t group,uint16_t elem)
+bool DocEntryArchive::Push(uint16_t group, uint16_t elem)
{
- std::string key = DictEntry::TranslateToKey(group,elem);
-
- if( Archive.find(key)==Archive.end() )
+ //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);
+ DocEntry *old = ArchFile->GetDocEntry(group, elem);
Archive[key] = old;
- if( old )
- ArchFile->RemoveEntryNoDestroy(old);
+ if ( old )
+ {
+ old->Register();
+ ArchFile->RemoveEntry(old);
+ }
return true;
}
* @return FALSE when the key isn't in the archive,
* TRUE otherwise
*/
-bool DocEntryArchive::Restore(uint16_t group,uint16_t elem)
+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() )
+ if ( restoreIt!=Archive.end() )
{
// Delete the new value
- DocEntry *rem = ArchFile->GetDocEntry(group,elem);
- if( rem )
+ 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();
}
it!=Archive.end();
++it)
{
- if(it->second)
+ if ( it->second )
it->second->Print(os);
}
}