X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=dbf05c6065215f64dcf39c1dadd5bc4f271ede86;hb=c67ffef593e7635d8dfa7d3fe63d702e5afafc3e;hp=44044e4f64da07765d8978fea65de7597a1cce73;hpb=ed0cb816b9fbe45a5dfead3f7d95194e0cbbd3a4;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 44044e4f..dbf05c60 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/19 15:24:28 $ - Version: $Revision: 1.46 $ + Date: $Date: 2005/01/25 15:44:24 $ + Version: $Revision: 1.51 $ 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,7 @@ 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) @@ -42,21 +42,13 @@ ElementSet::ElementSet(int depthLevel) */ ElementSet::~ElementSet() { - for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc) - { - if ( cc->second ) - { - delete cc->second; - } - } - TagHT.clear(); + ClearEntry(); } //----------------------------------------------------------------------------- // Print /** - * \brief Prints the Header Entries (Dicom Elements) - * from the H Table + * \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 */ @@ -96,11 +88,20 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype) } } -//----------------------------------------------------------------------------- -// Protected - -//----------------------------------------------------------------------------- -// Private +/** + * \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 add a new Dicom Element pointer to the H Table @@ -186,5 +187,27 @@ 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 + //----------------------------------------------------------------------------- } // end namespace gdcm