X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.h;h=0173958a015a6c936bbd18374775808ace0e646d;hb=928d3c30e40ab7f3d12bfd038ce8a48befcddce8;hp=1247e043b75b4cd8686bb7ad6a250fa26c2d24e9;hpb=e9d0fe99cef1e82bbc29c6dd5f65f7c1ccbd3412;p=gdcm.git diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 1247e043..0173958a 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/06/17 12:36:07 $ - Version: $Revision: 1.51 $ + Date: $Date: 2005/10/20 15:24:09 $ + Version: $Revision: 1.60 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,19 +20,19 @@ #define GDCMDOCENTRYSET_H #include "gdcmBase.h" +#include "gdcmVRKey.h" +#include "gdcmTagKey.h" + #include namespace gdcm { //----------------------------------------------------------------------------- class DocEntry; -class ValEntry; -class BinEntry; +class DataEntry; class SeqEntry; class DictEntry; -typedef std::string BaseTagKey; - //----------------------------------------------------------------------------- /** * \brief @@ -60,9 +60,9 @@ class GDCM_EXPORT DocEntrySet : public Base { public: /// Canonical Constructor - DocEntrySet() {}; + DocEntrySet(); /// Canonical Destructor - virtual ~DocEntrySet() {}; + virtual ~DocEntrySet() {} /// \brief write any type of entry to the entry set virtual void WriteContent (std::ofstream *fp, FileType filetype) = 0; @@ -70,66 +70,58 @@ public: /// \brief Remove all Entry in the entry set virtual void ClearEntry() = 0; /// \brief adds any type of entry to the entry set - virtual bool AddEntry(DocEntry *Entry) = 0; + virtual bool AddEntry(DocEntry *entry) = 0; /// \brief Removes any type of entry out of the entry set, and destroys it - virtual bool RemoveEntry(DocEntry *EntryToRemove) = 0; + virtual bool RemoveEntry(DocEntry *entryToRemove) = 0; /// \brief Removes any type of entry out of the entry set, DOESN'T destroy it - virtual bool RemoveEntryNoDestroy(DocEntry *EntryToRemove) = 0; + virtual bool RemoveEntryNoDestroy(DocEntry *entryToRemove) = 0; /// Gets the first entry of any type of set virtual DocEntry *GetFirstEntry()=0; /// Gets the next entry of any type of set virtual DocEntry *GetNextEntry()=0; - virtual std::string GetEntryValue(uint16_t group, uint16_t elem); - virtual void *GetEntryBinArea(uint16_t group, uint16_t elem); + virtual std::string GetEntryString(uint16_t group, uint16_t elem); + virtual void *GetEntryBinArea(uint16_t group, uint16_t elem); virtual int GetEntryLength(uint16_t group, uint16_t elem); - virtual std::string GetEntryVR(uint16_t group, uint16_t elem); + virtual std::string GetEntryForcedAsciiValue(uint16_t group, uint16_t elem); /// \brief Gets any type of DocEntry, identified by its (group,elem) virtual DocEntry *GetDocEntry(uint16_t group, uint16_t elem) = 0; - /// \brief Gets a ValEntry, identified by its (group, elem) - ValEntry *GetValEntry(uint16_t group, uint16_t elem); - /// \brief Gets a BinEntry, identified by its (group,elem) - BinEntry *GetBinEntry(uint16_t group, uint16_t elem); + /// \brief Gets a DataEntry, identified by its (group, elem) + DataEntry *GetDataEntry(uint16_t group, uint16_t elem); /// \brief Gets a SeqEntry, identified by its (group,elem) SeqEntry *GetSeqEntry(uint16_t group, uint16_t elem); - bool SetValEntry(std::string const &content, - uint16_t group, uint16_t elem); - bool SetBinEntry(uint8_t *content, int lgth, - uint16_t group, uint16_t elem); - bool SetValEntry(std::string const &content, ValEntry *entry); - bool SetBinEntry(uint8_t *content, int lgth, BinEntry *entry); - - ValEntry *InsertValEntry(std::string const &value, + bool SetEntryString(std::string const &content, + uint16_t group, uint16_t elem); + bool SetEntryBinArea(uint8_t *content, int lgth, + uint16_t group, uint16_t elem); + bool SetEntryString(std::string const &content, DataEntry *entry); + bool SetEntryBinArea(uint8_t *content, int lgth, DataEntry *entry); + + DataEntry *InsertEntryString(std::string const &value, + uint16_t group, uint16_t elem, + VRKey const &vr = GDCM_VRUNKNOWN); + DataEntry *InsertEntryBinArea(uint8_t *binArea, int lgth, uint16_t group, uint16_t elem, - TagName const &vr = GDCM_UNKNOWN); - BinEntry *InsertBinEntry(uint8_t *binArea, int lgth, - uint16_t group, uint16_t elem, - TagName const &vr = GDCM_UNKNOWN); + VRKey const &vr = GDCM_VRUNKNOWN); SeqEntry *InsertSeqEntry(uint16_t group, uint16_t elem); /// tells us if the set contains no entry virtual bool IsEmpty() = 0; virtual bool CheckIfEntryExist(uint16_t group, uint16_t elem); // DocEntry related utilities - ValEntry *NewValEntry(uint16_t group,uint16_t elem, - TagName const &vr = GDCM_UNKNOWN); - BinEntry *NewBinEntry(uint16_t group, uint16_t elem, - TagName const &vr = GDCM_UNKNOWN); + DataEntry *NewDataEntry(uint16_t group,uint16_t elem, + VRKey const &vr = GDCM_VRUNKNOWN); SeqEntry *NewSeqEntry(uint16_t group, uint16_t elem); -// DictEntry related utilities - DictEntry *NewVirtualDictEntry(uint16_t group,uint16_t elem, - TagName const &vr = GDCM_UNKNOWN, - TagName const &vm = GDCM_UNKNOWN, - TagName const &name = GDCM_UNKNOWN ); - protected: // DictEntry related utilities DictEntry *GetDictEntry(uint16_t group, uint16_t elem); DictEntry *GetDictEntry(uint16_t group, uint16_t elem, - TagName const &vr); + VRKey const &vr); + /// To be able to backtrack (Private Sequence, Implicit VR related pb) + DocEntry *PreviousDocEntry; private: };