X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=9e510814df433678865a4f339247394f51e68858;hb=7350639601914cd8ab02bfb0d6668c5bf56ce2f4;hp=b5d452c773c86bdd6801e15fd8a91c90bcd9cc83;hpb=559c3639fc5b255b36a951f352db1addead9f78f;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index b5d452c7..9e510814 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2004/11/03 20:52:13 $ - Version: $Revision: 1.34 $ + Date: $Date: 2005/02/01 10:29:56 $ + Version: $Revision: 1.52 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,6 +21,7 @@ #include "gdcmTS.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" #include #include @@ -28,18 +29,16 @@ namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup SeqEntry * \brief Constructor from a given SeqEntry */ -SeqEntry::SeqEntry( DictEntry* e ) +SeqEntry::SeqEntry( DictEntry *e ) : DocEntry(e) { - UsableLength = 0; - ReadLength = 0xffffffff; + Length = 0; + ReadLength = 0xffffffff; SQDepthLevel = -1; DelimitorMode = false; @@ -50,16 +49,17 @@ SeqEntry::SeqEntry( DictEntry* e ) * \brief Constructor from a given SeqEntry * @param e Pointer to existing Doc entry * @param depth depth level of the current Seq entry - */ -SeqEntry::SeqEntry( DocEntry* e, int depth ) + */ +SeqEntry::SeqEntry( DocEntry *e, int depth ) : DocEntry( e->GetDictEntry() ) { - this->UsableLength = 0; - this->ReadLength = 0xffffffff; + Length = 0; + ReadLength = 0xffffffff; SQDepthLevel = depth; - this->ImplicitVR = e->IsImplicitVR(); - this->Offset = e->GetOffset(); + ImplicitVR = e->IsImplicitVR(); + Offset = e->GetOffset(); + SeqTerm = NULL; } /** @@ -71,55 +71,20 @@ SeqEntry::~SeqEntry() { delete *cc; } - if (!SeqTerm) + if (SeqTerm) { delete SeqTerm; } } -/** - * \brief canonical Printer - */ -void SeqEntry::Print( std::ostream &os ) -{ - // First, Print the Dicom Element itself. - SetPrintLevel(2); - DocEntry::Print(os); - os << std::endl; - - if (GetReadLength() == 0) - return; - - // Then, Print each SQ Item - for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) - { - (*cc)->Print(os); - } - - // at end, print the sequence terminator item, if any - if (DelimitorMode) - { - for ( int i = 0; i < SQDepthLevel; i++ ) - { - os << " | " ; - } - if (SeqTerm != NULL) - { - SeqTerm->Print(os); - os << std::endl; - } - else - { - // fuse - os << " -------------- should have a sequence terminator item"; - } - } -} - +//----------------------------------------------------------------------------- +// Public /* * \brief canonical Writer + * @param fp pointer to an already open file + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) */ -void SeqEntry::Write(std::ofstream* fp, FileType filetype) +void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype) { uint16_t seq_term_gr = 0xfffe; uint16_t seq_term_el = 0xe0dd; @@ -128,12 +93,12 @@ void SeqEntry::Write(std::ofstream* fp, FileType filetype) //uint16_t item_term_gr = 0xfffe; //uint16_t item_term_el = 0xe00d; - DocEntry::Write(fp, filetype); + DocEntry::WriteContent(fp, filetype); for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) { - (*cc)->Write(fp, filetype); + (*cc)->WriteContent(fp, filetype); } // we force the writting of a Sequence Delimitation item @@ -143,23 +108,42 @@ void SeqEntry::Write(std::ofstream* fp, FileType filetype) binary_write(*fp, seq_term_lg); } -//----------------------------------------------------------------------------- -// Public +/** + * \brief Get the first entry while visiting the SeqEntry + * \return The first SQItem if found, otherwhise NULL + */ +SQItem *SeqEntry::GetFirstSQItem() +{ + 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 + */ -/// \brief adds the passed ITEM to the ITEM chained List for this SeQuence. -void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber) +SQItem *SeqEntry::GetNextSQItem() { - sqItem->SetSQItemNumber(itemNumber); - Items.push_back(sqItem); + gdcmAssertMacro (ItSQItem != Items.end()) + { + ++ItSQItem; + if (ItSQItem != Items.end()) + return *ItSQItem; + } + return NULL; } - + /** * \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) +SQItem *SeqEntry::GetSQItem(int nb) { if (nb<0) { @@ -175,8 +159,34 @@ SQItem* SeqEntry::GetSQItemByOrdinalNumber(int nb) return *cc; } } - return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME + return *(Items.end()); } + +/** + * \brief returns the number of SQItems within the current Sequence + */ +unsigned int SeqEntry::GetNumberOfSQItems() +{ + return Items.size(); +} + +/** + * \brief adds the passed ITEM to the ITEM chained List for this SeQuence. + * @param sqItem SQItem to be pushed back in the SeqEntry + * @param itemNumber ordinal number of the SQItem + * \note NOT end-user intendend method ! + */ +void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber) +{ +// FIXME : SQItemNumber is supposed to be the ordinal number of the SQItem +// within the Sequence. +// Either only 'push_back' is allowed, +// and we just have to do something like SeqEntry::lastNb++ +// Or we can add (or remove) anywhere, and SQItemNumber will be broken + sqItem->SetSQItemNumber(itemNumber); + Items.push_back(sqItem); +} + //----------------------------------------------------------------------------- // Protected @@ -185,5 +195,47 @@ SQItem* SeqEntry::GetSQItemByOrdinalNumber(int nb) // Private //----------------------------------------------------------------------------- -} // end namespace gdcm +// Print +/** + * \brief canonical Printer + */ +void SeqEntry::Print( std::ostream &os, std::string const & ) +{ + // First, Print the Dicom Element itself. + os << "S "; + DocEntry::Print(os); + os << std::endl; + + if (GetReadLength() == 0) + return; + // Then, Print each SQ Item + for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) + { + (*cc)->SetPrintLevel(PrintLevel); + (*cc)->Print(os); + } + + // at end, print the sequence terminator item, if any + if (DelimitorMode) + { + for ( int i = 0; i < SQDepthLevel; i++ ) + { + os << " | " ; + } + if (SeqTerm != NULL) + { + SeqTerm->SetPrintLevel(PrintLevel); + SeqTerm->Print(os); + os << std::endl; + } + else + { + // fuse + gdcmVerboseMacro(" -------- should have a sequence terminator item"); + } + } +} + +//----------------------------------------------------------------------------- +} // end namespace gdcm