Program: gdcm
Module: $RCSfile: gdcmDocEntryArchive.cxx,v $
Language: C++
- Date: $Date: 2005/01/11 00:21:48 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2005/01/26 11:42:02 $
+ Version: $Revision: 1.10 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/**
* \brief Constructor
*/
-DocEntryArchive::DocEntryArchive(Header *header):
- HeaderHT(header->TagHT)
+DocEntryArchive::DocEntryArchive(File *file)
{
+ ArchFile = file;
}
//-----------------------------------------------------------------------------
// Public
/**
* \brief Replace in the Header a DocEntry by the new DocEntry. The last
- * DocEntry is kept in archieve
+ * 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 archieved with the same
+ * @return FALSE when an other DocEntry is already archived with the same
* generalized key, TRUE otherwise
*/
bool DocEntryArchive::Push(DocEntry *newEntry)
if(!newEntry)
return false;
- uint16_t gr = newEntry->GetDictEntry()->GetGroup();
- uint16_t elt = newEntry->GetDictEntry()->GetElement();
- std::string key = DictEntry::TranslateToKey(gr,elt);
+ uint16_t group = newEntry->GetDictEntry()->GetGroup();
+ uint16_t elem = newEntry->GetDictEntry()->GetElement();
+ std::string key = DictEntry::TranslateToKey(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);
+
+ // Set the new DocEntry
+ ArchFile->AddEntry(newEntry);
+
+/* // Save the old DocEntry if any
TagDocEntryHT::iterator it = HeaderHT.find(key);
if( it!=HeaderHT.end() )
{
}
// Set the new DocEntry
- HeaderHT[key] = newEntry;
+ HeaderHT[key] = newEntry;*/
return true;
}
/**
* \brief Replace in the Header a DocEntry by the new DocEntry. The last
- * DocEntry is kept in archieve
+ * DocEntry is kept in archive
* @param group Group number of the Entry
- * @param element Element number of the Entry
- * @return FALSE when an other DocEntry is already archieved with the same
+ * @param elem Element number of the Entry
+ * @return FALSE when an other DocEntry is already archived with the same
* generalized key, TRUE otherwise
*/
-bool DocEntryArchive::Push(uint16_t group,uint16_t element)
+bool DocEntryArchive::Push(uint16_t group,uint16_t elem)
{
- std::string key = DictEntry::TranslateToKey(group,element);
+ std::string key = DictEntry::TranslateToKey(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);
+
+/* // Save the old DocEntry if any
TagDocEntryHT::iterator it = HeaderHT.find(key);
if( it!=HeaderHT.end() )
{
Archive[key] = it->second;
HeaderHT.erase(it);
- }
+ }*/
return true;
}
* \brief Restore in the Header the DocEntry that have the generalized key.
* The old entry is destroyed.
* @param group Group number of the Entry
- * @param element Element number of the Entry
- * @return FALSE when the generalized key isn't in the archieve,
+ * @param elem Element number of the Entry
+ * @return FALSE when the generalized key isn't in the archive,
* TRUE otherwise
*/
-bool DocEntryArchive::Restore(uint16_t group,uint16_t element)
+bool DocEntryArchive::Restore(uint16_t group,uint16_t elem)
{
- std::string key=DictEntry::TranslateToKey(group,element);
+ std::string key=DictEntry::TranslateToKey(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]);
+
+/* // Delete the new value
TagDocEntryHT::iterator restorePos = HeaderHT.find(key);
if( restorePos!=HeaderHT.end() )
{
delete restorePos->second;
}
+ // Restore the old value
if( Archive[key] )
{
HeaderHT[key] = Archive[key];
else
{
HeaderHT.erase(restorePos);
- }
+ }*/
Archive.erase(restoreIt);
}
/**
- * \brief Remove all DocEntry that are in the archive. The entries aren't
- * restored but only destroyed.
+ * \brief Remove all DocEntry that are in the archive.
+ * The entries aren't restored but only destroyed.
*/
-void DocEntryArchive::ClearArchive(void)
+void DocEntryArchive::ClearArchive( )
{
for(TagDocEntryHT::iterator it = Archive.begin();
it!=Archive.end();