X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=a1c445f729b2b9181e24eeffe3747cd556b13b2e;hb=d00078b5e19310b379c8339fa8fe38362e8ca392;hp=dc6ff34ce5caa9ce38296ece7e80e97cee0055bc;hpb=3842922fd2263cea5f679c9d283b3b4afead35d2;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index dc6ff34c..a1c445f7 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2005/01/19 08:57:14 $ - Version: $Revision: 1.92 $ + Date: $Date: 2005/01/20 16:17:00 $ + Version: $Revision: 1.95 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -65,10 +65,10 @@ public: /// 'Swap code' accessor (see \ref SwapCode ) int GetSwapCode() { return SwapCode; } // System access (meaning endian related !?) - uint16_t SwapShort(uint16_t); // needed by File - uint32_t SwapLong(uint32_t); // needed by File - uint16_t UnswapShort(uint16_t); // needed by File - uint32_t UnswapLong(uint32_t); // needed by File + uint16_t SwapShort(uint16_t); // needed by Document + uint32_t SwapLong(uint32_t); // needed by Document + uint16_t UnswapShort(uint16_t); // needed by Document + uint32_t UnswapLong(uint32_t); // needed by Document // Ordering of Documents bool operator<(Document &document); @@ -86,10 +86,14 @@ public: // Content entries +// Oops ! Python is gonna cry : +// 4 methods with same name and different parameters ... +// Only C++ is aware! + virtual bool SetEntry(std::string const &content, - uint16_t group, uint16_t element); + uint16_t group, uint16_t elem); virtual bool SetEntry(uint8_t *content, int lgth, - uint16_t group, uint16_t element); + uint16_t group, uint16_t elem); virtual bool SetEntry(std::string const &content, ValEntry *entry); virtual bool SetEntry(uint8_t *content, int lgth, BinEntry *entry); @@ -99,11 +103,6 @@ public: virtual std::string GetEntryVR(uint16_t group, uint16_t elem); virtual int GetEntryLength(uint16_t group, uint16_t elem); - DocEntry *GetDocEntry(uint16_t group, uint16_t element); - ValEntry *GetValEntry(uint16_t group, uint16_t element); - BinEntry *GetBinEntry(uint16_t group, uint16_t element); - SeqEntry *GetSeqEntry(uint16_t group, uint16_t element); - ValEntry *ReplaceOrCreate(std::string const &value, uint16_t group, uint16_t elem, TagName const &vr = GDCM_UNKNOWN); @@ -219,7 +218,7 @@ private: bool ReadTag(uint16_t, uint16_t); uint32_t ReadTagLength(uint16_t, uint16_t); - void Initialise(); + void Initialize(); bool CheckSwap(); void SwitchByteSwapCode(); void SetMaxSizeLoadEntry(long); @@ -255,7 +254,7 @@ private: uint32_t MaxSizePrintEntry; private: - friend class File; + friend class FileHelper; }; } // end namespace gdcm