X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=1f99df65691608fc99cd3f32b30297d768cdefd7;hb=3306c0c4d4513e73e1ca1ab60922ca02dc86a870;hp=0b373346fdc4b77ca884123f8f7e6896f6cca8bf;hpb=3785fddfe2583d592f815044dc0a944f98c08df2;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 0b373346..1f99df65 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2004/06/22 14:42:02 $ - Version: $Revision: 1.12 $ + Date: $Date: 2004/12/16 13:46:37 $ + Version: $Revision: 1.35 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -22,37 +22,38 @@ #include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" +namespace gdcm +{ + //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmElementSet - * \brief Constructor from a given gdcmElementSet + * \ingroup ElementSet + * \brief Constructor from a given ElementSet */ -gdcmElementSet::gdcmElementSet(int depthLevel) - : gdcmDocEntrySet(depthLevel) { +//BOZ depthLevel is not usefull anymore +ElementSet::ElementSet(int depthLevel) + : DocEntrySet() +{ + (void)depthLevel; } /** - * \ingroup gdcmElementSet + * \ingroup ElementSet * \brief Canonical destructor. */ -gdcmElementSet::~gdcmElementSet() +ElementSet::~ElementSet() { - gdcmDocEntry* EntryToDelete; - for(TagDocEntryHT::iterator cc = tagHT.begin();cc != tagHT.end();++cc) + for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) { - EntryToDelete = cc->second; - if ( EntryToDelete ) - delete EntryToDelete; + if ( cc->second ) + { + delete cc->second; + } } - tagHT.clear(); + TagHT.clear(); } - -//----------------------------------------------------------------------------- -// Public - - //----------------------------------------------------------------------------- // Print /** @@ -60,94 +61,134 @@ gdcmElementSet::~gdcmElementSet() * from the H Table * @return */ -void gdcmElementSet::Print(std::ostream & os) { - for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) +void ElementSet::Print(std::ostream& os) +{ + for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - //(i)->second->SetPrintLevel(printLevel); - (i->second)->Print(os); - } + DocEntry* entry = i->second; + + entry->SetPrintLevel(PrintLevel); + entry->Print(os); + + if ( SeqEntry* seqEntry = dynamic_cast(entry) ) + { + (void)seqEntry; + // Avoid the newline for a sequence: + continue; + } + os << std::endl; + } } +//----------------------------------------------------------------------------- +// Public /** * \brief Writes the Header Entries (Dicom Elements) * from the H Table * @return */ -void gdcmElementSet::Write(FILE *fp, FileType filetype) { - -// Troubles expected : BinEntries ARE ValEntries :-( -// BinEntry is checked first, then ValEntry; - - gdcmDocEntry *e; - for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) +void ElementSet::WriteContent(std::ofstream* fp, FileType filetype) +{ + for (TagDocEntryHT::const_iterator i = TagHT.begin(); + i != TagHT.end(); + ++i) { - e=i->second; - e->WriteCommonPart(fp, filetype); - std::cout<GetKey() << " " << std::hex << e->GetVR() << " " - << e->GetName() - << std::endl; - -// e->Write(fp,filetype); // This will be the right way to proceed ! - - if (gdcmBinEntry* BinEntry = dynamic_cast< gdcmBinEntry* >(e) ) { - BinEntry->Write(fp); - continue; - } - if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(e) ) { - ValEntry->Write(fp); - continue; - } - - if (gdcmSeqEntry* SeqEntry = dynamic_cast< gdcmSeqEntry* >(e) ) { - SeqEntry->Write(fp,filetype); - continue; - } + i->second->WriteContent(fp, filetype); } } -//----------------------------------------------------------------------------- -// Protected //----------------------------------------------------------------------------- +// Protected //----------------------------------------------------------------------------- // Private - /** * \brief add a new Dicom Element pointer to the H Table - * @param NewEntry entry to add + * @param newEntry entry to add */ -bool gdcmElementSet::AddEntry( gdcmDocEntry *NewEntry) { - TagKey key; - key = NewEntry->GetKey(); +bool ElementSet::AddEntry(DocEntry* newEntry) +{ + const TagKey& key = newEntry->GetKey(); - if(tagHT.count(key) == 1) + if( TagHT.count(key) == 1 ) { - dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ", + dbg.Verbose(1, "ElementSet::AddEntry key already present: ", key.c_str()); - return(false); - } - else + return false; + } + else + { + TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry)); + return true; + } +} + +/** + * \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) +{ + const TagKey& key = entryToRemove->GetKey(); + if( TagHT.count(key) == 1 ) { - tagHT[NewEntry->GetKey()] = NewEntry; - return(true); - } + TagHT.erase(key); + dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased."); + delete entryToRemove; + return true; + } + + dbg.Verbose(0, "ElementSet::RemoveEntry: key not present"); + return false ; } /** - * \brief Clear the hash table from given entry. - * @param EntryToRemove Entry to remove. + * \brief Clear the hash table from given entry BUT keep the entry. + * @param entryToRemove Entry to remove. */ -bool gdcmElementSet::RemoveEntry( gdcmDocEntry *EntryToRemove) +bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove) { - TagKey key = EntryToRemove->GetKey(); - if(tagHT.count(key) == 1) + const TagKey& key = entryToRemove->GetKey(); + if( TagHT.count(key) == 1 ) { - tagHT.erase(key); - dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased."); + TagHT.erase(key); + dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased."); return true; } - dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: "); - return(false); + 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