X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=317c108f9b6df7f08104eaf262e6ee1e5e65866f;hb=70a3a0f95bf2240a6ef4b1d6523c0e6614437304;hp=1f99df65691608fc99cd3f32b30297d768cdefd7;hpb=f5c7e83afd484a025285c64a09a89bd227087245;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 1f99df65..317c108f 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/12/16 13:46:37 $ - Version: $Revision: 1.35 $ + 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 @@ -28,7 +28,6 @@ namespace gdcm //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup ElementSet * \brief Constructor from a given ElementSet */ //BOZ depthLevel is not usefull anymore @@ -39,7 +38,6 @@ ElementSet::ElementSet(int depthLevel) } /** - * \ingroup ElementSet * \brief Canonical destructor. */ ElementSet::~ElementSet() @@ -59,9 +57,10 @@ ElementSet::~ElementSet() /** * \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 ElementSet::Print(std::ostream& os) +void ElementSet::Print(std::ostream &os, std::string const & ) { for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { @@ -70,9 +69,8 @@ void ElementSet::Print(std::ostream& os) entry->SetPrintLevel(PrintLevel); entry->Print(os); - if ( SeqEntry* seqEntry = dynamic_cast(entry) ) + if ( dynamic_cast(entry) ) { - (void)seqEntry; // Avoid the newline for a sequence: continue; } @@ -85,9 +83,10 @@ void ElementSet::Print(std::ostream& os) /** * \brief Writes the Header Entries (Dicom Elements) * from the H Table - * @return + * @param fp ofstream to write to + * @param filetype filetype */ -void ElementSet::WriteContent(std::ofstream* fp, FileType filetype) +void ElementSet::WriteContent(std::ofstream *fp, FileType filetype) { for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); @@ -97,9 +96,131 @@ void ElementSet::WriteContent(std::ofstream* fp, FileType 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 @@ -107,14 +228,13 @@ void ElementSet::WriteContent(std::ofstream* fp, FileType filetype) * \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()); + gdcmVerboseMacro( "Key already present: " << key.c_str()); return false; } else @@ -127,21 +247,19 @@ bool ElementSet::AddEntry(DocEntry* newEntry) /** * \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) +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."); + //gdcmVerboseMacro( "One element erased."); delete entryToRemove; return true; } - dbg.Verbose(0, "ElementSet::RemoveEntry: key not present"); + gdcmVerboseMacro( "Key not present"); return false ; } @@ -149,46 +267,75 @@ bool ElementSet::RemoveEntry( DocEntry* entryToRemove) * \brief Clear the hash table from given entry BUT keep the entry. * @param entryToRemove Entry to remove. */ -bool ElementSet::RemoveEntryNoDestroy(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."); + //gdcmVerboseMacro( "One element erased."); return true; } - dbg.Verbose(0, "ElementSet::RemoveEntry: key not present"); + gdcmVerboseMacro( "Key not present"); return false ; } /** - * \brief Initialise the visit of the Hash table (TagHT) + * \brief Get the first entry while visiting the DocEntrySet + * \return The first DocEntry if found, otherwhise NULL */ -void ElementSet::Initialize() +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 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()) - { - DocEntry *tmp = ItTagHT->second; - ++ItTagHT; + return ItTagHT->second; + return NULL; +} - return(tmp); - } - else - { - 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