X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmElementSet.cxx;h=2129c837e487109a4b2cfce69e5f91a99886ebfd;hb=0416947420d9168401c99e7fbf0dca0a081c9175;hp=42639f89265d435529a3f93397bd236d102c28ee;hpb=c42ce41966ee7a572752d7f45ddff25b90515119;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 42639f89..2129c837 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/24 10:23:47 $ - Version: $Revision: 1.31 $ + Date: $Date: 2005/02/07 08:48:18 $ + Version: $Revision: 1.58 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,98 +24,55 @@ namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup ElementSet - * \brief Constructor from a given ElementSet + * \brief Constructor for a given ElementSet */ //BOZ depthLevel is not usefull anymore ElementSet::ElementSet(int depthLevel) - : DocEntrySet() + : DocEntrySet() { (void)depthLevel; } /** - * \ingroup ElementSet * \brief Canonical destructor. */ ElementSet::~ElementSet() { - for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) - { - if ( cc->second ) - { - delete cc->second; - } - } - TagHT.clear(); + ClearEntry(); } - //----------------------------------------------------------------------------- // Public - - -//----------------------------------------------------------------------------- -// Print -/** - * \brief Prints the Header Entries (Dicom Elements) - * from the H Table - * @return - */ -void ElementSet::Print(std::ostream& os) -{ - for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) - { - DocEntry* entry = i->second; - entry->Print(os); - if ( SeqEntry* seqEntry = dynamic_cast(entry) ) - { - (void)seqEntry; - // Avoid the newline for a sequence: - continue; - } - os << std::endl; - } -} - /** * \brief Writes the Header Entries (Dicom Elements) * from the H Table - * @return + * @param fp ofstream to write to + * @param filetype filetype */ -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); } } -//----------------------------------------------------------------------------- -// Protected - -//----------------------------------------------------------------------------- - -//----------------------------------------------------------------------------- -// Private /** * \brief add a new Dicom Element pointer to the H Table * @param newEntry entry to add */ -bool ElementSet::AddEntry(DocEntry* newEntry) +bool ElementSet::AddEntry(DocEntry *newEntry) { - const TagKey& key = newEntry->GetKey(); + const TagKey &key = newEntry->GetKey(); if( TagHT.count(key) == 1 ) { - dbg.Verbose(1, "ElementSet::AddEntry key already present: ", - key.c_str()); + gdcmWarningMacro( "Key already present: " << key.c_str()); return false; } else @@ -126,68 +83,130 @@ bool ElementSet::AddEntry(DocEntry* newEntry) } /** - * \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. */ -bool ElementSet::RemoveEntryNoDestroy(DocEntry* entryToRemove) +bool ElementSet::RemoveEntry( DocEntry *entryToRemove) { - const TagKey& key = entryToRemove->GetKey(); + const TagKey &key = entryToRemove->GetKey(); if( TagHT.count(key) == 1 ) { TagHT.erase(key); - dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased."); + //gdcmWarningMacro( "One element erased."); + delete entryToRemove; return true; } - dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: "); + gdcmWarningMacro( "Key not present"); return false ; } /** - * \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 + * \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(); + const TagKey &key = entryToRemove->GetKey(); if( TagHT.count(key) == 1 ) { TagHT.erase(key); - dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased."); - delete entryToRemove; + //gdcmWarningMacro( "One element erased."); return true; } - dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: "); + gdcmWarningMacro( "Key not present"); return false ; } /** - * \brief Initialise the visit of the Hash table (TagHT) + * \brief delete all entries in the ElementSet */ -void ElementSet::Initialize() +void ElementSet::ClearEntry() +{ + for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) + { + if ( cc->second ) + { + delete cc->second; + } + } + TagHT.clear(); +} + +/** + * \brief Get the first entry while visiting *the* 'zero level' DocEntrySet + * (DocEntries out of any Sequence) + * \return The first DocEntry if found, otherwhise NULL + */ +DocEntry *ElementSet::GetFirstEntry() { ItTagHT = TagHT.begin(); + if (ItTagHT != TagHT.end()) + return ItTagHT->second; + return NULL; } /** - * \brief Get the next entry whil visiting the Hash table (TagHT) + * \brief Get the next entry while visiting *the* 'zero level' DocEntrySet + * (DocEntries out of any Sequence) + * \note : meaningfull only if GetFirstEntry already called * \return The next DocEntry if found, otherwhise NULL */ DocEntry *ElementSet::GetNextEntry() { + gdcmAssertMacro (ItTagHT != TagHT.end()); + + ++ItTagHT; if (ItTagHT != TagHT.end()) - { - DocEntry *tmp = ItTagHT->second; - ++ItTagHT; + return ItTagHT->second; + return NULL; +} - return(tmp); - } - else +/** + * \brief retrieves a Dicom Element using (group, element) + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return + */ +DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) +{ + TagKey key = DictEntry::TranslateToKey(group, elem); + TagDocEntryHT::iterator it = TagHT.find(key); + + if ( it!=TagHT.end() ) + return it->second; + return NULL; +} + +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// Private + +//----------------------------------------------------------------------------- +// Print +/** + * \brief Prints the Header Entries (Dicom Elements) from the H Table + * @param os ostream to write to + * @param indent Indentation string to be prepended during printing + */ +void ElementSet::Print(std::ostream &os, std::string const & ) +{ + for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - return(NULL); + DocEntry *entry = i->second; + + entry->SetPrintLevel(PrintLevel); + entry->Print(os); + + if ( dynamic_cast(entry) ) + { + // Avoid the newline for a sequence: + continue; + } + os << std::endl; } }