From: jpr Date: Tue, 18 Jan 2005 12:16:10 +0000 (+0000) Subject: Add missing : X-Git-Tag: Version1.0.bp~267 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a1d06b93a6c5418cc3dbe29adc517cf356384bbe;p=gdcm.git Add missing : SQItem *SeqEntry::GetFirstEntry(), SQItem *SeqEntry::GetNextEntry() --- diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 59404d03..ed092100 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2005/01/18 08:01:42 $ - Version: $Revision: 1.45 $ + Date: $Date: 2005/01/18 12:16:10 $ + Version: $Revision: 1.46 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -159,7 +159,7 @@ void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber) /** * \brief return a pointer to the SQItem referenced by its ordinal number. * Returns the first item when argument is negative. - * Returns the last item when argument is bigget than the total + * Returns the last item when argument is bigger than the total * item number. */ SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb) @@ -180,6 +180,37 @@ SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb) } return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME } + +/** + * \brief Get the first entry while visiting the SeqEntry + * \return The first SQItem if found, otherwhise NULL + */ +SQItem *SeqEntry::GetFirstEntry() +{ + ItSQItem = Items.begin(); + if (ItSQItem != Items.end()) + return *ItSQItem; + return NULL; +} + + +/** + * \brief Get the next SQItem while visiting the SeqEntry + * \note : meaningfull only if GetFirstEntry already called + * \return The next SQItem if found, otherwhise NULL + */ + +SQItem *SeqEntry::GetNextEntry() +{ + gdcmAssertMacro (ItSQItem != Items.end()) + { + ++ItSQItem; + if (ItSQItem != Items.end()) + return *ItSQItem; + } + return NULL; +} + //----------------------------------------------------------------------------- // Protected diff --git a/src/gdcmSeqEntry.h b/src/gdcmSeqEntry.h index 91b5b8b8..e8ce9c7f 100644 --- a/src/gdcmSeqEntry.h +++ b/src/gdcmSeqEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.h,v $ Language: C++ - Date: $Date: 2005/01/16 04:50:42 $ - Version: $Revision: 1.28 $ + Date: $Date: 2005/01/18 12:16:10 $ + Version: $Revision: 1.29 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -48,6 +48,8 @@ public: /// returns the SQITEM chained List for this SeQuence. ListSQItem const &GetSQItems() const { return Items; } + SQItem *GetFirstEntry(); + SQItem *GetNextEntry(); /// Sets the delimitor mode void SetDelimitorMode(bool dm) { DelimitorMode = dm; } @@ -74,7 +76,9 @@ private: /// Chained list of SQ Items ListSQItem Items; - + /// iterator on the SQItems of the current SeqEntry + ListSQItem::iterator ItSQItem; + /// sequence terminator item DocEntry *SeqTerm;