Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 13:20:34 $
- Version: $Revision: 1.29 $
+ Date: $Date: 2004/12/03 17:13:18 $
+ Version: $Revision: 1.33 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
ElementSet::~ElementSet()
{
- for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+ for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
{
- DocEntry* entryToDelete = cc->second;
- if ( entryToDelete )
+ if ( cc->second )
{
- // FIXME
- // Because the gdcmFile links the datas of gdcmPixelConvert with the
- // data in a binArea, these datas are deleted 2 times... very bad...
- //delete entryToDelete;
+ delete cc->second;
}
}
TagHT.clear();
* from the H Table
* @return
*/
-void ElementSet::Write(std::ofstream* fp, FileType filetype)
+void ElementSet::WriteContent(std::ofstream* fp, FileType filetype)
{
for (TagDocEntryHT::const_iterator i = TagHT.begin();
i != TagHT.end();
++i)
{
- i->second->Write(fp, filetype);
+ i->second->WriteContent(fp, filetype);
}
}
//-----------------------------------------------------------------------------
}
/**
- * \brief Clear the hash table from given entry BUT keep the entry.
- * @param entryToRemove Entry to remove.
+ * \brief Clear the hash table from given entry AND delete the entry.
+ * @param entryToRemove Entry to remove AND delete.
+ * \warning Some problems when using under Windows... prefer the use of
+ * Initialize / GetNext methods
*/
-bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
+bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
{
const TagKey& key = entryToRemove->GetKey();
if( TagHT.count(key) == 1 )
{
TagHT.erase(key);
dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+ delete entryToRemove;
return true;
}
- dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+ dbg.Verbose(0, "ElementSet::RemoveEntry: key not present");
return false ;
}
/**
- * \brief Clear the hash table from given entry AND delete the entry.
- * @param entryToRemove Entry to remove AND delete.
+ * \brief Clear the hash table from given entry BUT keep the entry.
+ * @param entryToRemove Entry to remove.
*/
-bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
+bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove)
{
const TagKey& key = entryToRemove->GetKey();
if( TagHT.count(key) == 1 )
{
TagHT.erase(key);
dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
- delete entryToRemove;
return true;
}
- dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+ dbg.Verbose(0, "ElementSet::RemoveEntry: key not present");
return false ;
}
+
+/**
+ * \brief Initialise the visit of the Hash table (TagHT)
+ */
+void ElementSet::Initialize()
+{
+ ItTagHT = TagHT.begin();
+}
+
+/**
+ * \brief Get the next entry whil visiting the Hash table (TagHT)
+ * \return The next DocEntry if found, otherwhise NULL
+ */
+DocEntry *ElementSet::GetNextEntry()
+{
+ if (ItTagHT != TagHT.end())
+ {
+ DocEntry *tmp = ItTagHT->second;
+ ++ItTagHT;
+
+ return(tmp);
+ }
+ else
+ {
+ return(NULL);
+ }
+}
+
+//-----------------------------------------------------------------------------
} // end namespace gdcm