X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=4804928cb7ac8173dbbd62a9c069fcccafc5fda3;hb=6eb024e510fd273aea3e31e85630d6b36ff18c0c;hp=c59de89aecbd496b0911f67da800c56359e866ea;hpb=9eb58f53b417ac50bdfa817a02e6dd19ac6fbeb8;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index c59de89a..4804928c 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2005/10/26 09:15:19 $ - Version: $Revision: 1.69 $ + Date: $Date: 2005/11/29 12:48:47 $ + Version: $Revision: 1.71 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -62,13 +62,11 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype) // if they were found in the original document. if ( !MayIWrite( (i->second)->GetGroup() ) ) continue; - // Skip 'Group Length' element, since it may be wrong. // except for Group 0002 if ( (i->second)->GetElement() == 0x0000 - && (i->second)->GetElement() != 0x0002 ) - continue; - + && (i->second)->GetGroup() != 0x0002 ) + continue; i->second->WriteContent(fp, filetype); } } @@ -172,6 +170,29 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem) return NULL; } +/** + * \brief Copies all the attributes from an other DocEntrySet + * @param set entry to copy from + * @remarks The contained DocEntries a not copied, only referenced + */ +void ElementSet::Copy(DocEntrySet *set) +{ + // Remove all previous entries + ClearEntry(); + + DocEntrySet::Copy(set); + + ElementSet *eltSet = dynamic_cast(set); + if( eltSet ) + { + TagHT = eltSet->TagHT; + for(ItTagHT = TagHT.begin();ItTagHT != TagHT.end();++ItTagHT) + { + (ItTagHT->second)->Register(); + } + } +} + //----------------------------------------------------------------------------- // Protected