X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=5e7113f6219f93181685010648a23a0c3811cd1d;hb=fc71b6d6df72ee061f0a88e3de407a83511f8ed2;hp=fb0dfdfc2110af4526b38cd02d1ae2f2637a54ec;hpb=af288a85afcf018ea938b95dc5c87284ee9b83d6;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index fb0dfdfc..5e7113f6 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2005/11/07 09:46:36 $ - Version: $Revision: 1.62 $ + Date: $Date: 2006/02/16 20:06:15 $ + Version: $Revision: 1.65 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -81,12 +81,12 @@ 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; + uint32_t seq_term_lg = 0x00000000; // ignore 'Zero length' Sequences if ( GetReadLength() == 0 ) return; - + DocEntry::WriteContent(fp, filetype); for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); @@ -230,10 +230,37 @@ void SeqEntry::SetDelimitationItem(DocEntry *e) } } +/** + * \brief Copies all the attributes from an other DocEntry + * @param doc entry to copy from + * @remarks The contained SQItems a not copied, only referenced + */ +void SeqEntry::Copy(DocEntry *doc) +{ + // Delete previous SQ items + ClearSQItem(); + + DocEntry::Copy(doc); + SeqEntry *entry = dynamic_cast(doc); + if ( entry ) + { + DelimitorMode = entry->DelimitorMode; + SQDepthLevel = entry->SQDepthLevel; + + SeqTerm = entry->SeqTerm; + if(SeqTerm) + SeqTerm->Register(); + Items = entry->Items; + for(ItSQItem = Items.begin();ItSQItem != Items.end(); ++ItSQItem) + { + (*ItSQItem)->Register(); + } + } +} + //----------------------------------------------------------------------------- // Protected - //----------------------------------------------------------------------------- // Private