X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=78911b138de921deae81b062e55830db0d8a54f0;hb=4976cfdaa3bb61e01e7ad0a2382d7e9622918acd;hp=88e79a62d7d0b24fe71914870daee30b8b33bdc4;hpb=e9fee33d4fe77ece33a62f08f30d7b144af0a45b;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 88e79a62..78911b13 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/10/25 03:03:45 $ - Version: $Revision: 1.33 $ + Date: $Date: 2005/01/24 16:10:53 $ + Version: $Revision: 1.50 $ 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 @@ -32,14 +33,13 @@ 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 +50,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,19 +72,21 @@ SeqEntry::~SeqEntry() { delete *cc; } - if (!SeqTerm) + if (SeqTerm) { delete SeqTerm; } } +//----------------------------------------------------------------------------- +// Print /** * \brief canonical Printer */ -void SeqEntry::Print( std::ostream &os ) +void SeqEntry::Print( std::ostream &os, std::string const & ) { // First, Print the Dicom Element itself. - SetPrintLevel(2); + os << "S "; DocEntry::Print(os); os << std::endl; @@ -93,6 +96,7 @@ void SeqEntry::Print( std::ostream &os ) // Then, Print each SQ Item for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc) { + (*cc)->SetPrintLevel(PrintLevel); (*cc)->Print(os); } @@ -105,21 +109,26 @@ void SeqEntry::Print( std::ostream &os ) } if (SeqTerm != NULL) { + SeqTerm->SetPrintLevel(PrintLevel); SeqTerm->Print(os); os << std::endl; } else { // fuse - os << " -------------- should have a sequence terminator item"; + gdcmVerboseMacro(" -------- 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,38 +137,57 @@ 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 // because we wrote the Sequence as a 'no Length' sequence - fp->write ( (char*)&seq_term_gr,(size_t)2 ); - fp->write ( (char*)&seq_term_el,(size_t)2 ); - fp->write ( (char*)&seq_term_lg,(size_t)4 ); + 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 adds the passed ITEM to the ITEM chained List for this SeQuence. -void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber) +/** + * \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::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 +203,22 @@ SQItem* SeqEntry::GetSQItemByOrdinalNumber(int nb) return *cc; } } - return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME + return *(Items.end()); } + +/// \brief retuens 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. +void SeqEntry::AddSQItem(SQItem *sqItem, int itemNumber) +{ + sqItem->SetSQItemNumber(itemNumber); + Items.push_back(sqItem); +} + //----------------------------------------------------------------------------- // Protected