X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.h;h=7f31fb4783d2d1126630ca10461d3cad9a5eaba2;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=98d95b533ff48ee270a7b153d177d7cdc92fea9b;hpb=a585fafed1e72e092c6a1942c8692991c1688e7f;p=gdcm.git diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 98d95b53..7f31fb47 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.h,v $ Language: C++ - Date: $Date: 2005/11/21 09:46:26 $ - Version: $Revision: 1.63 $ + Date: $Date: 2007/09/17 12:16:02 $ + Version: $Revision: 1.73 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,8 +16,8 @@ =========================================================================*/ -#ifndef GDCMDOCENTRYSET_H -#define GDCMDOCENTRYSET_H +#ifndef _GDCMDOCENTRYSET_H_ +#define _GDCMDOCENTRYSET_H_ #include "gdcmRefCounter.h" #include "gdcmVRKey.h" @@ -25,7 +25,7 @@ #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- class DocEntry; @@ -36,23 +36,23 @@ class DictEntry; //----------------------------------------------------------------------------- /** * \brief - * \ref DocEntrySet is an abstract base class for \ref ElementSet - * and \ref SQItem which are both containers for DocEntries. - * - \ref ElementSet is based on the STL map<> container - * (see \ref ElementSet::TagHT) - * - \ref SQItem is based on an STL list container (see \ref ListDocEntry). + * DocEntrySet is an abstract base class for ElementSet, SQItem + * which are both containers for DocEntries. + * - ElementSet is based on the STL map<> container + * (see ElementSet::TagHT) + * - SQItem is based on an STL list container (see ListDocEntry). * * Since the syntax for adding a new element to a map<> or a list<> - * differ, \ref DocEntrySet is designed as an adapter to unify the - * interfaces of \ref DocEntrySet and \ref ElementSet. + * differ, DocEntrySet is designed as an adapter to unify the + * interfaces of DocEntrySet and ElementSet. * * As an illustration of this design, please refer to the implementation - * of \ref AddEntry (or any pure virtual method) in both derived classes. + * of AddEntry (or any pure virtual method) in both derived classes. * This adapter unification of interfaces enables the parsing of a * DICOM header containing (optionaly heavily nested) sequences to be - * written recursively [see \ref Document::ParseDES - * which calls \ref Document::ParseSQ, which in turn calls - * \ref Document::ParseDES ]. + * written recursively [see Document::ParseDES + * which calls Document::ParseSQ, which in turn calls + * Document::ParseDES ]. * * \note Developpers should strongly resist to the temptation of adding * members to this class since this class is designed as an adapter @@ -64,7 +64,8 @@ class GDCM_EXPORT DocEntrySet : public RefCounter public: /// \brief write any type of entry to the entry set - virtual void WriteContent (std::ofstream *fp, FileType filetype) = 0; + virtual void WriteContent (std::ofstream *fp, FileType filetype, + bool insideMetaElements,bool insideSequence ) = 0; /// \brief Remove all Entry of the current set virtual void ClearEntry() = 0; @@ -111,6 +112,8 @@ public: VRKey const &vr = GDCM_VRUNKNOWN); SeqEntry *NewSeqEntry(uint16_t group, uint16_t elem); + virtual void Copy(DocEntrySet *) {}; + protected: /// Canonical Constructor DocEntrySet(); @@ -119,8 +122,8 @@ protected: // DictEntry related utilities DictEntry *GetDictEntry(uint16_t group, uint16_t elem); - DictEntry *GetDictEntry(uint16_t group, uint16_t elem, - VRKey const &vr); + // DictEntry *GetDictEntry(uint16_t group, uint16_t elem, + // VRKey const &vr); /// To be able to backtrack (Private Sequence, Implicit VR related pb) DocEntry *PreviousDocEntry;