X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=41b2b30afe7926141938e472f319ea0ffe047479;hb=e28b183ba68aa3cc84a44a779a31f9d906a1ad2f;hp=abc8b9cf90f5b64c25f4eb2b3296854a1da9478a;hpb=6b91390e1086959c40c0ae9a37912877a6f14c36;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index abc8b9cf..41b2b30a 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/21 04:43:02 $ - Version: $Revision: 1.13 $ + Date: $Date: 2004/10/12 04:35:48 $ + Version: $Revision: 1.31 $ 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,25 +24,47 @@ #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) { + UsableLength = 0; + ReadLength = 0xffffffff; + SQDepthLevel = -1; + delimitor_mode = false; seq_term = 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() ) +{ + this->UsableLength = 0; + this->ReadLength = 0xffffffff; SQDepthLevel = depth; + + this->ImplicitVR = e->IsImplicitVR(); + this->Offset = e->GetOffset(); } /** - * \ingroup gdcmSeqEntry * \brief Canonical destructor. */ -gdcmSeqEntry::~gdcmSeqEntry() { +SeqEntry::~SeqEntry() { for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc) { delete *cc; @@ -51,80 +73,99 @@ gdcmSeqEntry::~gdcmSeqEntry() { delete seq_term; } -//----------------------------------------------------------------------------- -// Print -/* - * \ingroup gdcmSeqEntry +/** * \brief canonical Printer */ -void gdcmSeqEntry::Print(std::ostream &os){ - - std::ostringstream s,s2; - std::string vr; - //unsigned short int g, e; //not used - //long lgth; //not used - //size_t o; //not used - //char greltag[10]; //group element tag //not used - //char st[20]; //not used - +void SeqEntry::Print( std::ostream &os ) +{ // 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) - { + 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 + // at end, print the sequence terminator item, if any if (delimitor_mode) { - if (SQDepthLevel>0) { - for (int i=0;iPrint(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::Write(FILE* 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::Write(fp, filetype); + for(ListSQItem::iterator cc = GetSQItems().begin(); + cc != GetSQItems().end(); + ++cc) + { + (*cc)->Write(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); +} //----------------------------------------------------------------------------- // 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); } -/// \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 ; + return (*(items.begin())); + int count = 0 ; for(ListSQItem::iterator cc = items.begin(); - cc != items.end(); - count ++, ++cc){ + cc != items.end(); + count ++, ++cc){ if (count==nb) - return (*cc); + return *cc; } - return (*(items.end())); + return (*(items.end())); // Euhhhhh ?!? Is this the last one . FIXME } //----------------------------------------------------------------------------- // Protected @@ -134,3 +175,5 @@ gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) { // Private //----------------------------------------------------------------------------- +} // end namespace gdcm +