X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=78911b138de921deae81b062e55830db0d8a54f0;hb=587eff0d2fdea1b61c4cc9aa21f06f2ba8b42c10;hp=d31c2b10b38e93632fb8ae9f0a75043113bcd2e4;hpb=44a9814938a6824d3a66b932429084517da6dadf;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index d31c2b10..78911b13 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2004/09/13 12:10:53 $ - Version: $Revision: 1.27 $ + 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 - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -21,91 +21,114 @@ #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, int depth) - : gdcmDocEntry(e) +SeqEntry::SeqEntry( DictEntry *e ) + : DocEntry(e) { - UsableLength = 0; - ReadLength = 0xffffffff; - SQDepthLevel = depth; + 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; + if (SeqTerm) + { + delete SeqTerm; + } } +//----------------------------------------------------------------------------- +// Print /** * \brief canonical Printer */ -void gdcmSeqEntry::Print(std::ostream &os) +void SeqEntry::Print( std::ostream &os, std::string const & ) { // First, Print the Dicom Element itself. - SetPrintLevel(2); - gdcmDocEntry::Print(os); + 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) + 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 (delimitor_mode) { - for (int i=0;iPrint(os); + } + if (SeqTerm != NULL) + { + SeqTerm->SetPrintLevel(PrintLevel); + SeqTerm->Print(os); os << std::endl; } else - // fusible - os << " -------------- should have a sequence terminator item"; + { + // fuse + 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 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; @@ -114,50 +137,88 @@ 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 adds the passed ITEM to the ITEM chained List for this SeQuence. -void gdcmSeqEntry::AddEntry(gdcmSQItem *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. */ -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 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 @@ -166,3 +227,5 @@ gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) // Private //----------------------------------------------------------------------------- +} // end namespace gdcm +