Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 09:17:08 $
- Version: $Revision: 1.66 $
+ Date: $Date: 2005/10/27 11:39:34 $
+ Version: $Revision: 1.70 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
for (TagDocEntryHT::const_iterator i = TagHT.begin();
i != TagHT.end();
++i)
- {
- i->second->WriteContent(fp, filetype);
+ {
+ // depending on the gdcm::Document type
+ // (gdcm::File; gdcm::DicomDir, (more to come ?)
+ // some groups *cannot* be present.
+ // We hereby protect gdcm for writting stupid things
+ // if they were found in the original document.
+ if ( !MayIWrite( (i->second)->GetGroup() ) )
+ continue;
+ // Skip 'Group Length' element, since it may be wrong.
+ // except for Group 0002
+ if ( (i->second)->GetElement() == 0x0000
+ && (i->second)->GetGroup() != 0x0002 )
+ continue;
+ i->second->WriteContent(fp, filetype);
}
}
else
{
TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry));
+ newEntry->Register();
return true;
}
}
if ( TagHT.count(key) == 1 )
{
TagHT.erase(key);
- //gdcmWarningMacro( "One element erased.");
- delete entryToRemove;
+ entryToRemove->Unregister();
return true;
}
return false ;
}
-/**
- * \brief Clear the hash table from given entry BUT keep the entry.
- * @param entryToRemove Entry to remove.
- */
-bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
-{
- const TagKey &key = entryToRemove->GetKey();
- if ( TagHT.count(key) == 1 )
- {
- TagHT.erase(key);
- //gdcmWarningMacro( "One element erased.");
- return true;
- }
-
- gdcmWarningMacro( "Key not present " << key);
- return false ;
-}
-
/**
* \brief delete all entries in the ElementSet
*/
{
if ( cc->second )
{
- delete cc->second;
+ cc->second->Unregister();
}
}
TagHT.clear();