X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=2129c837e487109a4b2cfce69e5f91a99886ebfd;hb=0068e5861800986e33ee5eeac99863c4e01e3512;hp=9b8becbaa52cae97612b83cc87747cfb95be99c6;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 9b8becba..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: 2005/02/05 01:37:08 $ - Version: $Revision: 1.56 $ + 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 @@ -31,7 +31,7 @@ namespace gdcm */ //BOZ depthLevel is not usefull anymore ElementSet::ElementSet(int depthLevel) - : DocEntrySet() + : DocEntrySet() { (void)depthLevel; } @@ -163,45 +163,6 @@ DocEntry *ElementSet::GetNextEntry() return NULL; } -/** - * \brief Get the first ValEntry while visiting *the* 'zero level' DocEntrySet - * (DocEntries out of any Sequence) - * This method is designed for Python users - * \return The first ValEntry if found, otherwhise NULL - */ -ValEntry *ElementSet::GetFirstValEntry() -{ - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = GetFirstEntry(); - // an other iterator is needed to allow user iterate - // at the same time both on DocEntries and ValEntries - ItValEntryTagHT = ItTagHT; - if ( (valEntry = dynamic_cast(d))) - return valEntry; - return GetNextValEntry(); -} - -/** - * \brief Get the next ValEntry while visiting *the* 'zero level' DocEntrySet - * (DocEntries out of any Sequence) - * \note : meaningfull only if GetFirstValEntry already called - * \return The next ValEntry if found, otherwhise NULL - */ -ValEntry *ElementSet::GetNextValEntry() -{ - gdcm::ValEntry *valEntry; - gdcm::DocEntry *d = ItValEntryTagHT->second; - ++ItValEntryTagHT; - while( d ) - { - if ( (valEntry = dynamic_cast(d))) - return valEntry; - else - return GetNextValEntry(); - } - return 0; -} - /** * \brief retrieves a Dicom Element using (group, element) * @param group Group number of the searched Dicom Element @@ -235,7 +196,7 @@ void ElementSet::Print(std::ostream &os, std::string const & ) { for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { - DocEntry* entry = i->second; + DocEntry *entry = i->second; entry->SetPrintLevel(PrintLevel); entry->Print(os);