X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=ca6e13055ef178074d8f2930b5f2ca2f5fdeac88;hb=32fd7ed911ec51eaf623bdd9f32aa09297519589;hp=9ba911ee236863df0c045455c90c40b0a668b29a;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 9ba911ee..ca6e1305 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/07/02 13:55:28 $ - Version: $Revision: 1.21 $ + Date: $Date: 2004/08/31 14:24:47 $ + Version: $Revision: 1.26 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -36,8 +36,24 @@ gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth) delimitor_mode = false; seq_term = NULL; SQDepthLevel = depth; + UsableLength = 0; + ReadLength = 0xffffffff; } +/** + * \brief Constructor from a given gdcmSeqEntry + * @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()) +{ + this->UsableLength = 0; + this->ReadLength = 0xffffffff; + this->ImplicitVR = e->IsImplicitVR(); + this->Offset = e->GetOffset(); + //this->printLevel = e->GetPrintLevel(); // no longer exists ?!? + this->SQDepthLevel = depth; +} /** * \brief Canonical destructor. */ @@ -90,23 +106,20 @@ void gdcmSeqEntry::Write(FILE *fp, FileType filetype) { uint16_t seq_term_gr = 0xfffe; uint16_t seq_term_el = 0xe0dd; - uint32_t seq_term_lg = 0x00000000; - - uint16_t item_term_gr = 0xfffe; - uint16_t item_term_el = 0xe00d; + uint32_t seq_term_lg = 0xffffffff; + //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(); ++cc) - { + { (*cc)->Write(fp, filetype); - - 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); } - //we force the writting of a Sequence Delimitaion item + + //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);