X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.h;h=bdb050ce3b052b9d147142e455736789a9f54c6e;hb=5e64f1feb4d82a4da9893dca043212ac90807fe4;hp=4ed6d4a0e0f8bedac3f0e630297c4e1b305ef193;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 4ed6d4a0..bdb050ce 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.h,v $ Language: C++ - Date: $Date: 2004/07/02 13:55:27 $ - Version: $Revision: 1.13 $ + Date: $Date: 2004/10/25 03:35:19 $ + Version: $Revision: 1.22 $ 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 @@ -20,68 +20,88 @@ #define GDCMDOCENTRYSET_H #include "gdcmException.h" -#include "gdcmDocEntry.h" - + +namespace gdcm +{ +class DocEntry; +class ValEntry; +class BinEntry; +class SeqEntry; +class DictEntry; + +typedef std::string BaseTagKey; //----------------------------------------------------------------------------- -class GDCM_EXPORT gdcmDocEntrySet +/** + * \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), as opposed to \ref SQItem + * which is based on an STL list container (see \ref SQItem::docEntries). + * 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. + * As an illustration of this design, please refer to the implementation + * of \ref 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 turns calls + * \ref Document::ParseDES ]. + * + * \note Developpers should strongly resist to the temptation of adding + * members to this class since this class is designed as an adapter + * in the form of an abstract base class. + */ +class GDCM_EXPORT DocEntrySet { public: - - gdcmDocEntrySet(int depth = 0); - virtual ~gdcmDocEntrySet(); + DocEntrySet() {}; + virtual ~DocEntrySet() {}; /// \brief adds any type of entry to the entry set (pure vitual) - virtual bool AddEntry(gdcmDocEntry *Entry) = 0; // pure virtual + virtual bool AddEntry(DocEntry *Entry) = 0; // pure virtual /// \brief prints any type of entry to the entry set (pure vitual) virtual void Print (std::ostream & os = std::cout) = 0;// pure virtual /// \brief write any type of entry to the entry set - virtual void Write (FILE *fp, FileType filetype)=0;// pure virtual - - /// \brief Gets the depth level of a Dicom Header Entry embedded in a - /// SeQuence - int GetDepthLevel(void) { return SQDepthLevel; } - - /// \brief Sets the depth level of a Dicom Header Entry embedded in a - /// SeQuence - void SetDepthLevel(int depth) { SQDepthLevel = depth; } - - virtual gdcmDocEntry* GetDocEntryByNumber(uint16_t group, - uint16_t element) = 0; - gdcmDocEntry *GetDocEntryByName(std::string name); - virtual std::string GetEntryByNumber(uint16_t group,uint16_t element) = 0; - std::string GetEntryByName(TagName name); - gdcmDictEntry *NewVirtualDictEntry(uint16_t group, - uint16_t element, - std::string vr = "unkn", - std::string fourth = "unkn", - std::string name = "unkn"); + virtual void Write (std::ofstream *fp, FileType filetype) = 0;// pure virtual + + virtual DocEntry* GetDocEntryByNumber(uint16_t group, + uint16_t element) = 0; + DocEntry *GetDocEntryByName(TagName const & name); + virtual std::string GetEntryByNumber(uint16_t group, uint16_t element) = 0; + std::string GetEntryByName(TagName const & name); + DictEntry *NewVirtualDictEntry(uint16_t group, + uint16_t element, + TagName const & vr = "unkn", + TagName const & fourth = "unkn", + TagName const & name = "unkn"); protected: // DocEntry related utilities - gdcmValEntry* NewValEntryByNumber(uint16_t group, - uint16_t element); - gdcmBinEntry* NewBinEntryByNumber(uint16_t group, - uint16_t element); - gdcmDocEntry* NewDocEntryByNumber(uint16_t group, - uint16_t element); - gdcmDocEntry* NewDocEntryByName (std::string Name); + ValEntry* NewValEntryByNumber(uint16_t group, + uint16_t element); + BinEntry* NewBinEntryByNumber(uint16_t group, + uint16_t element); + DocEntry* NewDocEntryByNumber(uint16_t group, + uint16_t element); + DocEntry* NewDocEntryByNumber(uint16_t group, + uint16_t element, + TagName const & vr); + DocEntry* NewDocEntryByName (TagName const & name); + SeqEntry* NewSeqEntryByNumber(uint16_t group, + uint16_t element); // DictEntry related utilities - gdcmDictEntry *GetDictEntryByName (std::string Name); - gdcmDictEntry *GetDictEntryByNumber(uint16_t, uint16_t); + DictEntry *GetDictEntryByName (TagName const & name); + DictEntry *GetDictEntryByNumber(uint16_t, uint16_t); - /// Gives the depth level of the element set inside SeQuences - int SQDepthLevel; - -private: - }; - +} // end namespace gdcm //----------------------------------------------------------------------------- #endif