X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmSeqEntry.cxx;h=9e510814df433678865a4f339247394f51e68858;hb=bbfa3cf89fc2ede7c43259e945f021044b56069f;hp=0fd0b47d3bbe5d46a67758b93705b1c9ec821b3f;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 0fd0b47d..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/09/27 08:39:07 $ - Version: $Revision: 1.30 $ + 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,96 +21,70 @@ #include "gdcmTS.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" #include #include +#include + +namespace gdcm +{ //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmSeqEntry - * \brief Constructor from a given gdcmSeqEntry + * \brief Constructor from a given SeqEntry */ -gdcmSeqEntry::gdcmSeqEntry( gdcmDictEntry* e ) - : gdcmDocEntry(e) +SeqEntry::SeqEntry( DictEntry *e ) + : DocEntry(e) { - UsableLength = 0; - ReadLength = 0xffffffff; + Length = 0; + ReadLength = 0xffffffff; SQDepthLevel = -1; - delimitor_mode = false; - seq_term = NULL; + DelimitorMode = false; + SeqTerm = NULL; } /** - * \brief Constructor from a given gdcmSeqEntry + * \brief Constructor from a given SeqEntry * @param e Pointer to existing Doc entry * @param depth depth level of the current Seq entry - */ -gdcmSeqEntry::gdcmSeqEntry( gdcmDocEntry* e, int depth ) - : gdcmDocEntry( e->GetDictEntry() ) + */ +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; } /** * \brief Canonical destructor. */ -gdcmSeqEntry::~gdcmSeqEntry() { - for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc) +SeqEntry::~SeqEntry() +{ + for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) { delete *cc; } - if (!seq_term) - delete seq_term; -} - -/** - * \brief canonical Printer - */ -void gdcmSeqEntry::Print( std::ostream &os ) -{ - // First, Print the Dicom Element itself. - SetPrintLevel(2); - gdcmDocEntry::Print(os); - os << std::endl; - - if (GetReadLength() == 0) - return; - - // Then, Print each SQ Item - for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc) + if (SeqTerm) { - (*cc)->Print(os); + delete SeqTerm; } - - // at end, print the sequence terminator item, if any - if (delimitor_mode) { - for ( int i = 0; i < SQDepthLevel; i++ ) - { - os << " | " ; - } - if (seq_term != NULL) - { - seq_term->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 gdcmSeqEntry::Write(FILE* fp, FileType filetype) +void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype) { uint16_t seq_term_gr = 0xfffe; uint16_t seq_term_el = 0xe0dd; @@ -119,50 +93,100 @@ void gdcmSeqEntry::Write(FILE* fp, FileType filetype) //uint16_t item_term_gr = 0xfffe; //uint16_t item_term_el = 0xe00d; - gdcmDocEntry::Write(fp, filetype); - for(ListSQItem::iterator cc = GetSQItems().begin(); - cc != GetSQItems().end(); + 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 // because we wrote the Sequence as a 'no Length' sequence - fwrite ( &seq_term_gr,(size_t)2 ,(size_t)1 ,fp); - fwrite ( &seq_term_el,(size_t)2 ,(size_t)1 ,fp); - fwrite ( &seq_term_lg,(size_t)4 ,(size_t)1 ,fp); + binary_write(*fp, seq_term_gr); + binary_write(*fp, seq_term_el); + 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 gdcmSeqEntry::AddEntry(gdcmSQItem *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. */ -gdcmSQItem* gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) +SQItem *SeqEntry::GetSQItem(int nb) { if (nb<0) - return (*(items.begin())); + { + return *(Items.begin()); + } int count = 0 ; - for(ListSQItem::iterator cc = items.begin(); - cc != items.end(); - count ++, ++cc){ - if (count==nb) + for(ListSQItem::iterator cc = Items.begin(); + cc != Items.end(); + count ++, ++cc) + { + if (count == 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 @@ -171,3 +195,47 @@ gdcmSQItem* gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) // Private //----------------------------------------------------------------------------- +// 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