X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=9f2c4d195f3f622047720f68595af5b92c86cbf4;hb=9ca4fd0ccbfea12ed7760856de3a8faf41625869;hp=11f048daf885dd33cadeb71a15957360d7fcccca;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 11f048da..9f2c4d19 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/06/20 18:08:48 $ - Version: $Revision: 1.12 $ + Date: $Date: 2005/01/07 16:45:52 $ + Version: $Revision: 1.42 $ 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 @@ -24,107 +24,161 @@ #include #include +#include + +namespace gdcm +{ + //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmSeqEntry - * \brief Constructor from a given gdcmSeqEntry + * \ingroup SeqEntry + * \brief Constructor from a given SeqEntry */ -gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth) - : gdcmDocEntry(e) +SeqEntry::SeqEntry( DictEntry *e ) + : DocEntry(e) { - delimitor_mode = false; - seq_term = NULL; + Length = 0; + ReadLength = 0xffffffff; + SQDepthLevel = -1; + + DelimitorMode = false; + SeqTerm = NULL; +} + +/** + * \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 ) + : DocEntry( e->GetDictEntry() ) +{ + Length = 0; + ReadLength = 0xffffffff; SQDepthLevel = depth; + + ImplicitVR = e->IsImplicitVR(); + Offset = e->GetOffset(); + SeqTerm = NULL; } /** - * \ingroup gdcmSeqEntry * \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 -/* - * \ingroup gdcmSeqEntry +/** * \brief canonical Printer */ -void gdcmSeqEntry::Print(std::ostream &os){ +void SeqEntry::Print( std::ostream &os ) +{ + // First, Print the Dicom Element itself. + os << "S "; + DocEntry::Print(os); + os << std::endl; - std::ostringstream s,s2; - std::string vr; - unsigned short int g, e; - long lgth; - size_t o; - char greltag[10]; //group element tag - char st[20]; + if (GetReadLength() == 0) + return; - // First, Print the Dicom Element itself. - SetPrintLevel(2); - PrintCommonPart(os); - s << std::endl; - os << s.str(); - - // Then, Print each SQ Item - for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc) - { + // 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 (delimitor_mode) { - if (SQDepthLevel>0) { - for (int i=0;iPrint(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 - std::cout - << " -------------- should have a sequence terminator item" - << std::endl; + { + // fuse + os << " -------------- should have a sequence terminator item"; + } } - } +} + +/* + * \brief canonical Writer + */ +void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype) +{ + uint16_t seq_term_gr = 0xfffe; + uint16_t seq_term_el = 0xe0dd; + uint32_t seq_term_lg = 0xffffffff; + + //uint16_t item_term_gr = 0xfffe; + //uint16_t item_term_el = 0xe00d; + + DocEntry::WriteContent(fp, filetype); + for(ListSQItem::iterator cc = Items.begin(); + cc != Items.end(); + ++cc) + { + (*cc)->WriteContent(fp, filetype); + } + + // we force the writting of a Sequence Delimitation item + // because we wrote the Sequence as a 'no Length' sequence + binary_write(*fp, seq_term_gr); + binary_write(*fp, seq_term_el); + binary_write(*fp, seq_term_lg); +} //----------------------------------------------------------------------------- // Public - /// \brief adds the passed ITEM to the ITEM chained List for this SeQuence. -void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem, int itemNumber) { +/// \brief adds the passed ITEM to the ITEM chained List for this SeQuence. +void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber) +{ sqItem->SetSQItemNumber(itemNumber); - items.push_back(sqItem); + Items.push_back(sqItem); } -/// \brief Sets the depth level of a Sequence Entry embedded in a SeQuence -void gdcmSeqEntry::SetDepthLevel(int depth) { - SQDepthLevel = depth; -} - -/// \brief return a pointer to th SQItem referenced by its ordinal number -/// (returns the first one if ordinal number is <0 -/// returns the last one if ordinal number is > item number - -gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) { +/** + * \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 + * item number. + */ +SQItem *SeqEntry::GetSQItemByOrdinalNumber(int nb) +{ if (nb<0) - return (*(items.begin())); - int count = 0 ; - for(ListSQItem::iterator cc = items.begin(); - cc != items.end(); - count ++, ++cc){ - if (count==nb) - return (*cc); + { + return *(Items.begin()); } - return (*(items.end())); + int count = 0 ; + 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 } //----------------------------------------------------------------------------- // Protected @@ -134,3 +188,5 @@ gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) { // Private //----------------------------------------------------------------------------- +} // end namespace gdcm +