X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=41b2b30afe7926141938e472f319ea0ffe047479;hb=40b909789581894e57a0d8f22d6f1f91f55e7f84;hp=5ee43c7754ac1272155b85ad50b53278fc31a865;hpb=3fd520b58c8d1939994de2c63cc038c3e7ac9522;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 5ee43c77..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/08/26 15:29:53 $ - Version: $Revision: 1.23 $ + 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,39 +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) { - delimitor_mode = false; - seq_term = NULL; - SQDepthLevel = depth; UsableLength = 0; ReadLength = 0xffffffff; + SQDepthLevel = -1; + + delimitor_mode = false; + seq_term = NULL; } /** - * \brief Constructor from a given gdcmSeqEntry + * \brief Constructor from a given SeqEntry * @param e Pointer to existing Doc entry - */ -gdcmSeqEntry::gdcmSeqEntry(gdcmDocEntry* e, int depth) : gdcmDocEntry(e->GetDictEntry()) + * @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(); - //this->printLevel = e->GetPrintLevel(); // no longer exists ?!? - this->SQDepthLevel = e->GetDepthLevel(); } + /** * \brief Canonical destructor. */ -gdcmSeqEntry::~gdcmSeqEntry() { +SeqEntry::~SeqEntry() { for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc) { delete *cc; @@ -65,14 +73,14 @@ gdcmSeqEntry::~gdcmSeqEntry() { delete seq_term; } -/* +/** * \brief canonical Printer */ -void gdcmSeqEntry::Print(std::ostream &os){ - +void SeqEntry::Print( std::ostream &os ) +{ // First, Print the Dicom Element itself. SetPrintLevel(2); - gdcmDocEntry::Print(os); + DocEntry::Print(os); os << std::endl; if (GetReadLength() == 0) @@ -86,46 +94,45 @@ void gdcmSeqEntry::Print(std::ostream &os){ // at end, print the sequence terminator item, if any if (delimitor_mode) { - for (int i=0;iPrint(os); os << std::endl; } else - // fusible + { + // fuse os << " -------------- should have a sequence terminator item"; + } } } /* * \brief canonical Writer */ -void gdcmSeqEntry::Write(FILE *fp, FileType filetype) +void SeqEntry::Write(FILE* fp, FileType filetype) { uint16_t seq_term_gr = 0xfffe; uint16_t seq_term_el = 0xe0dd; - uint32_t seq_term_lg = 0x00000000; + uint32_t seq_term_lg = 0xffffffff; - uint16_t item_term_gr = 0xfffe; - uint16_t item_term_el = 0xe00d; - - gdcmDocEntry::Write(fp, filetype); + //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 an Item Delimitation item - // because we wrote the Item as a 'no Length' item - fwrite ( &item_term_gr,(size_t)2 ,(size_t)1 ,fp); - fwrite ( &item_term_el,(size_t)2 ,(size_t)1 ,fp); - fwrite ( &seq_term_lg, (size_t)4 ,(size_t)1 ,fp); // Heu ..... } - //we force the writting of a Sequence Delimitation item - // because we wrote the Sequence as a 'no Length' sequence + // 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); @@ -134,22 +141,21 @@ void gdcmSeqEntry::Write(FILE *fp, FileType filetype) //----------------------------------------------------------------------------- // 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 the 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 ; @@ -169,3 +175,5 @@ gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) { // Private //----------------------------------------------------------------------------- +} // end namespace gdcm +