X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=317c108f9b6df7f08104eaf262e6ee1e5e65866f;hb=0ad9dae4659b21bfd5c834c1af724eab4dcdf4f6;hp=18af6a70ac952a6dfe3980caadb950ab63ad0815;hpb=16887ff26b068405a235a6a8a37f4e62516de393;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 18af6a70..317c108f 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/25 03:06:38 $ - Version: $Revision: 1.14 $ + Date: $Date: 2005/01/23 10:12:33 $ + Version: $Revision: 1.48 $ 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,118 +22,320 @@ #include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" +namespace gdcm +{ + //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmElementSet - * \brief Constructor from a given gdcmElementSet + * \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 * \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 /** * \brief Prints the Header Entries (Dicom Elements) * from the H Table - * @return + * @param os ostream to write to + * @param indent Indentation string to be prepended during printing */ -void gdcmElementSet::Print(std::ostream & os) +void ElementSet::Print(std::ostream &os, std::string const & ) { - gdcmDocEntry* Entry; - for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) + for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - Entry = i->second; - Entry->Print(os); - bool PrintEndLine = true; - if ( gdcmSeqEntry* SeqEntry = dynamic_cast(Entry) ) + DocEntry* entry = i->second; + + entry->SetPrintLevel(PrintLevel); + entry->Print(os); + + if ( dynamic_cast(entry) ) { - (void)SeqEntry; //not used - PrintEndLine = false; + // Avoid the newline for a sequence: + continue; } - if (PrintEndLine) - os << std::endl; - } + os << std::endl; + } } +//----------------------------------------------------------------------------- +// Public /** * \brief Writes the Header Entries (Dicom Elements) * from the H Table - * @return + * @param fp ofstream to write to + * @param filetype filetype */ -void gdcmElementSet::Write(FILE *fp, FileType filetype) +void ElementSet::WriteContent(std::ofstream *fp, FileType filetype) { - - for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) + for (TagDocEntryHT::const_iterator i = TagHT.begin(); + i != TagHT.end(); + ++i) { - i->second->Write(fp, filetype); + i->second->WriteContent(fp, filetype); } } + +/** + * \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); + if ( !TagHT.count(key)) + { + return NULL; + } + return TagHT.find(key)->second; +} + +/** + * \brief Same as \ref Document::GetDocEntry except it only + * returns a result when the corresponding entry is of type + * ValEntry. + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return When present, the corresponding ValEntry. + */ +ValEntry *ElementSet::GetValEntry(uint16_t group, uint16_t elem) +{ + DocEntry *currentEntry = GetDocEntry(group, elem); + if ( !currentEntry ) + { + return 0; + } + if ( ValEntry *entry = dynamic_cast(currentEntry) ) + { + return entry; + } + gdcmVerboseMacro( "Unfound ValEntry."); + + return 0; +} + +/** + * \brief Same as \ref Document::GetDocEntry except it only + * returns a result when the corresponding entry is of type + * BinEntry. + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return When present, the corresponding BinEntry. + */ +BinEntry *ElementSet::GetBinEntry(uint16_t group, uint16_t elem) +{ + DocEntry *currentEntry = GetDocEntry(group, elem); + if ( !currentEntry ) + { + return 0; + } + if ( BinEntry *entry = dynamic_cast(currentEntry) ) + { + return entry; + } + gdcmVerboseMacro( "Unfound BinEntry."); + + return 0; +} + +/** + * \brief Same as \ref Document::GetDocEntry except it only + * returns a result when the corresponding entry is of type + * SeqEntry. + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return When present, the corresponding SeqEntry. + */ +SeqEntry *ElementSet::GetSeqEntry(uint16_t group, uint16_t elem) +{ + DocEntry *currentEntry = GetDocEntry(group, elem); + if ( !currentEntry ) + { + return 0; + } + if ( SeqEntry *entry = dynamic_cast(currentEntry) ) + { + return entry; + } + gdcmVerboseMacro( "Unfound SeqEntry."); + + return 0; +} + + //----------------------------------------------------------------------------- // Protected -//----------------------------------------------------------------------------- +/** + * \brief Checks if a given Dicom Element exists within the H table + * @param group Group number of the searched Dicom Element + * @param elem Element number of the searched Dicom Element + * @return true is found + */ +bool ElementSet::CheckIfEntryExist(uint16_t group, uint16_t elem ) +{ + const std::string &key = DictEntry::TranslateToKey(group, elem ); + return TagHT.count(key) != 0; +} + +/** + * \brief Searches within Header Entries (Dicom Elements) parsed with + * the public and private dictionaries + * for the element value representation of a given tag. + * @param group Group number of the searched tag. + * @param elem Element number of the searched tag. + * @return Corresponding element value representation when it exists, + * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. + */ +std::string ElementSet::GetEntry(uint16_t group, uint16_t elem) +{ + TagKey key = DictEntry::TranslateToKey(group, elem); + if ( !TagHT.count(key)) + { + return GDCM_UNFOUND; + } + + return ((ValEntry *)TagHT.find(key)->second)->GetValue(); +} + //----------------------------------------------------------------------------- // 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: ", - key.c_str()); - return(false); - } - else + gdcmVerboseMacro( "Key already present: " << key.c_str()); + return false; + } + else { - tagHT[NewEntry->GetKey()] = NewEntry; - return(true); - } + TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry)); + return true; + } } /** - * \brief Clear the hash table from given 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 gdcmElementSet::RemoveEntry( gdcmDocEntry *EntryToRemove) +bool ElementSet::RemoveEntry( 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); + //gdcmVerboseMacro( "One element erased."); + delete entryToRemove; return true; } - dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: "); - return(false); + gdcmVerboseMacro( "Key not present"); + 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); + //gdcmVerboseMacro( "One element erased."); + return true; + } + + gdcmVerboseMacro( "Key not present"); + return false ; +} + +/** + * \brief Get the first entry while visiting the DocEntrySet + * \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 while visiting the Hash table (TagHT) + * \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()) + return ItTagHT->second; + return NULL; +} + + +/** + * \brief Get the larst entry while visiting the DocEntrySet + * \return The last DocEntry if found, otherwhise NULL + */ +DocEntry *ElementSet::GetLastEntry() +{ + ItTagHT = TagHT.end(); + if ( ItTagHT != TagHT.begin() ) + return ItTagHT->second; + return NULL; +} + +/** + * \brief Get the previous entry while visiting the Hash table (TagHT) + * \note : meaningfull only if GetFirstEntry already called + * \return The previous DocEntry if found, otherwhise NULL + */ +DocEntry *ElementSet::GetPreviousEntry() +{ + gdcmAssertMacro (ItTagHT != TagHT.begin()); + + --ItTagHT; + if (ItTagHT != TagHT.begin()) + return ItTagHT->second; + return NULL; +} + + +//----------------------------------------------------------------------------- +} // end namespace gdcm