X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=30db948fc89f50800d74bb238341b27e93d327ec;hb=aedf83c26c99c5e632f159b91138b0e178b9fb4b;hp=cf778c42745d9a3faf69fe42030045ee36070c5d;hpb=033352f8a0d333fc12b7fa625d1819a574f4ddef;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index cf778c42..30db948f 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2005/01/20 11:37:37 $ - Version: $Revision: 1.47 $ + Date: $Date: 2005/07/11 20:47:00 $ + Version: $Revision: 1.62 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,15 +24,14 @@ namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \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; } @@ -42,40 +41,7 @@ ElementSet::ElementSet(int depthLevel) */ ElementSet::~ElementSet() { - for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) - { - if ( cc->second ) - { - delete cc->second; - } - } - TagHT.clear(); -} - -//----------------------------------------------------------------------------- -// 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) - { - DocEntry* entry = i->second; - - entry->SetPrintLevel(PrintLevel); - entry->Print(os); - - if ( dynamic_cast(entry) ) - { - // Avoid the newline for a sequence: - continue; - } - os << std::endl; - } + ClearEntry(); } //----------------------------------------------------------------------------- @@ -96,102 +62,6 @@ 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 - -//----------------------------------------------------------------------------- -// Private - /** * \brief add a new Dicom Element pointer to the H Table * @param newEntry entry to add @@ -200,9 +70,9 @@ bool ElementSet::AddEntry(DocEntry *newEntry) { const TagKey &key = newEntry->GetKey(); - if( TagHT.count(key) == 1 ) + if ( TagHT.count(key) == 1 ) { - gdcmVerboseMacro( "Key already present: " << key.c_str()); + gdcmWarningMacro( "Key already present: " << key ); return false; } else @@ -219,15 +89,15 @@ bool ElementSet::AddEntry(DocEntry *newEntry) bool ElementSet::RemoveEntry( DocEntry *entryToRemove) { const TagKey &key = entryToRemove->GetKey(); - if( TagHT.count(key) == 1 ) + if ( TagHT.count(key) == 1 ) { TagHT.erase(key); - //gdcmVerboseMacro( "One element erased."); + //gdcmWarningMacro( "One element erased."); delete entryToRemove; return true; } - gdcmVerboseMacro( "Key not present"); + gdcmWarningMacro( "Key not present"); return false ; } @@ -238,19 +108,35 @@ bool ElementSet::RemoveEntry( DocEntry *entryToRemove) bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove) { const TagKey &key = entryToRemove->GetKey(); - if( TagHT.count(key) == 1 ) + if ( TagHT.count(key) == 1 ) { TagHT.erase(key); - //gdcmVerboseMacro( "One element erased."); + //gdcmWarningMacro( "One element erased."); return true; } - gdcmVerboseMacro( "Key not present"); + gdcmWarningMacro( "Key not present"); return false ; } /** - * \brief Get the first entry while visiting the DocEntrySet + * \brief delete all entries in the ElementSet + */ +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() @@ -262,7 +148,8 @@ DocEntry *ElementSet::GetFirstEntry() } /** - * \brief Get the next entry while 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 */ @@ -276,5 +163,52 @@ DocEntry *ElementSet::GetNextEntry() return NULL; } +/** + * \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) + { + DocEntry *entry = i->second; + + entry->SetPrintLevel(PrintLevel); + entry->Print(os); + + if ( dynamic_cast(entry) ) + { + // Avoid the newline for a sequence: + continue; + } + os << std::endl; + } +} + //----------------------------------------------------------------------------- } // end namespace gdcm