X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=0b60c37da9f498b6d40d225a8b0945cec9d40a2c;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=37340268a3fe5510c328290063ee13f2c59d83b8;hpb=6fc40309997e3c20fc494201644a3e8094f0c971;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 37340268..0b60c37d 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2004/11/16 10:37:54 $ - Version: $Revision: 1.28 $ + Date: $Date: 2004/11/25 15:46:11 $ + Version: $Revision: 1.32 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -44,12 +44,11 @@ ElementSet::ElementSet(int depthLevel) */ 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 ) { - delete entryToDelete; + delete cc->second; } } TagHT.clear(); @@ -88,13 +87,13 @@ void ElementSet::Print(std::ostream& os) * 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); } } //----------------------------------------------------------------------------- @@ -147,6 +146,8 @@ bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove) /** * \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::RemoveEntry( DocEntry* entryToRemove) { @@ -162,4 +163,33 @@ bool ElementSet::RemoveEntry( DocEntry* entryToRemove) 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