X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.h;h=c0d4087055b77203acc17f67a5c42a47ea2d7c05;hb=41559a6f2d66bcd4af4db17a0d9668df37d19f3b;hp=5dd19d657bef8ae1e5d8f1c410c8afef3bb8ecf1;hpb=9bc299b2b2e1b334a3bbfaf20aba3afa64d0f05b;p=gdcm.git diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index 5dd19d65..c0d40870 100644 --- a/src/gdcmDocEntry.h +++ b/src/gdcmDocEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.h,v $ Language: C++ - Date: $Date: 2005/01/19 15:58:00 $ - Version: $Revision: 1.39 $ + Date: $Date: 2005/11/28 16:31:23 $ + Version: $Revision: 1.58 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,7 +19,7 @@ #ifndef GDCMDOCENTRY_H #define GDCMDOCENTRY_H -#include "gdcmBase.h" +#include "gdcmRefCounter.h" #include "gdcmDictEntry.h" #include @@ -27,9 +27,7 @@ namespace gdcm { -class Header; -class ValEntry; -class BinEntry; +class File; class SeqEntry; //----------------------------------------------------------------------------- @@ -37,120 +35,108 @@ class SeqEntry; * \brief The dicom header of a Dicom file contains a set of such entries * (when successfuly parsed against a given Dicom dictionary) */ -class GDCM_EXPORT DocEntry : public Base +class GDCM_EXPORT DocEntry : public RefCounter { + gdcmTypeMacro(DocEntry); + public: - DocEntry(DictEntry*); - virtual ~DocEntry() {}; + virtual void Print (std::ostream &os = std::cout, std::string const &indent = ""); + virtual void WriteContent(std::ofstream *fp, FileType filetype); - /// Returns the Dicom Group number of the current Dicom Header Entry - uint16_t GetGroup() { return DicomDict->GetGroup(); }; + /// \brief Gets the DicEntry of the current Dicom entry + /// @return The DicEntry of the current Dicom entry + DictEntry * GetDictEntry() { return DicomDict; } - /// Returns the Dicom Element number of the current Dicom Header Entry - uint16_t GetElement() { return DicomDict->GetElement();}; + /// Returns the Dicom Group number of the current Dicom entry + const uint16_t &GetGroup() const { return DicomDict->GetGroup(); } - /// Returns the 'key' of the current Dicom Header Entry - void SetKey( TagKey const &key ) { Key = key; } + /// Returns the Dicom Element number of the current Dicom entry + const uint16_t &GetElement() const { return DicomDict->GetElement();} - /// Returns the 'key' of the current Dicom Header Entry - std::string const &GetKey() const { return Key; } + /// Returns the 'key' of the current Dicom entry + TagKey GetKey() const { return DicomDict->GetKey(); } /// \brief Returns the 'Name' '(e.g. "Patient's Name") found in the Dicom /// Dictionnary of the current Dicom Header Entry - std::string const &GetName() const { return DicomDict->GetName(); }; + std::string const &GetName() const { return DicomDict->GetName(); } /// \brief Returns the 'Value Representation' (e.g. "PN" : Person Name, - /// "SL" : Signed Long), found in the Dicom Header or in the Dicom - /// Dictionnary, of the current Dicom Header Entry - std::string const &GetVR() const { return DicomDict->GetVR(); }; + /// "SL" : Signed Long), found in the Dicom header or in the Dicom + /// Dictionnary, of the current Dicom entry + VRKey const &GetVR() const { return DicomDict->GetVR(); } - /// \brief Returns the 'Value Multiplicity' (e.g. "1", "1-n", "6"), - /// found in the Dicom Header or in the Dicom Dictionnary - /// of the current Dicom Header Entry - std::string const &GetVM() const { return DicomDict->GetVM(); }; + /// \brief Returns the 'Value Multiplicity' (e.g. "1", 6", "1-n", "3-n"), + /// found in the Dicom entry or in the Dicom Dictionnary + /// of the current Dicom entry + std::string const &GetVM() const { return DicomDict->GetVM(); } - /// Sets the 'Value Multiplicity' of the current Dicom Header Entry - void SetVM( TagName const &v) { DicomDict->SetVM(v); }; + /// Sets the 'Value Multiplicity' of the current Dicom entry + void SetVM( TagName const &v) { DicomDict->SetVM(v); } /// \brief Returns offset (since the beginning of the file, including - /// the File Preamble, if any) of the value of the current Dicom HeaderEntry - /// \warning offset of the *value*, not of the Dicom Header Entry - size_t GetOffset() { return Offset; }; - + /// the File Preamble, if any) of the value of the current Dicom entry + /// \warning offset of the *value*, not of the Dicom entry + const size_t &GetOffset() const { return Offset; } /// \brief Sets only 'Read Length' (*not* 'Usable Length') of the current - /// Dicom Header Entry - void SetReadLength(uint32_t l) { ReadLength = l; }; - - /// \brief Returns the 'read length' of the current Dicom Header Entry - /// \warning this value is the one stored in the Dicom Header but not + /// Dicom entry + void SetReadLength(uint32_t l) { ReadLength = l; } + /// \brief Returns the 'read length' of the current Dicom entry + /// \warning this value is the one stored in the Dicom header but not /// mandatoryly the one thats's used (in case on SQ, or delimiters, /// the usable length is set to zero) - uint32_t GetReadLength() { return ReadLength; }; + const uint32_t &GetReadLength() const { return ReadLength; } /// \brief Sets both 'Read Length' and 'Usable Length' of the current - /// Dicom Header Entry - void SetLength(uint32_t l) { Length = l; }; - - /// \brief Returns the actual value length of the current Dicom Header Entry - /// \warning this value is not *always* the one stored in the Dicom Header - /// in case of well knowned bugs - uint32_t GetLength() { return Length; }; - - - // The following 3 members, for internal use only ! - - /// \brief Sets the offset of the Dicom Element + /// Dicom entry + virtual void SetLength(uint32_t l) { Length = l; } + /// \brief Returns the actual value length of the current Dicom entry + /// \warning this value is not *always* the one stored in the Dicom header + /// in case of well known bugs + const uint32_t &GetLength() const { return Length; } + + uint32_t GetFullLength(); + virtual uint32_t ComputeFullLength() = 0; + +// The following 3 members, for internal use only ! + /// \brief Sets the offset of the Dicom entry /// \warning use with caution ! /// @param of offset to be set - void SetOffset(size_t of) { Offset = of; }; + void SetOffset(size_t of) { Offset = of; } - /// Sets to TRUE the ImplicitVr flag of the current Dicom Element - void SetImplicitVR() { ImplicitVR = true; }; + /// Sets to TRUE the ImplicitVr flag of the current Dicom entry + void SetImplicitVR() { ImplicitVR = true; } - /// \brief Tells us if the current Dicom Element was checked as ImplicitVr - /// @return true if the current Dicom Element was checked as ImplicitVr - bool IsImplicitVR() { return ImplicitVR; }; + /// \brief Tells us if the current Dicom entry was checked as ImplicitVr + /// @return true if the current Dicom entry was checked as ImplicitVr + bool IsImplicitVR() const { return ImplicitVR; } - /// \brief Tells us if the VR of the current Dicom Element is Unknown + /// \brief Tells us if the VR of the current Dicom entry is Unknown /// @return true if the VR is unknown - bool IsVRUnknown() { return DicomDict->IsVRUnknown(); }; + bool IsVRUnknown() const { return DicomDict->IsVRUnknown(); } - /// \brief Tells us if the VM of the current Dicom Element is Unknown + /// \brief Tells us if the VM of the current Dicom entry is Unknown /// @return true if the VM is unknown - bool IsVMUnknown() { return DicomDict->IsVMUnknown(); }; - - /// \brief Gets the DicEntry of the current Dicom Element - /// @return The DicEntry of the current Dicom Element - DictEntry * GetDictEntry() { return DicomDict; }; - - virtual void WriteContent(std::ofstream *fp, FileType filetype); - - uint32_t GetFullLength(); - - void Copy(DocEntry *doc); + bool IsVMUnknown() const { return DicomDict->IsVMUnknown(); } bool IsItemDelimitor(); + bool IsItemStarter(); bool IsSequenceDelimitor(); - - virtual void Print (std::ostream &os = std::cout, std::string const & indent = ""); + + virtual void Copy(DocEntry *e); protected: - /// \brief Sets the DicEntry of the current Dicom Element - /// \remarks Used only by the Header !!! (possible because of a friend - /// link between them) - /// @param newEntry pointer to the DictEntry - void SetDictEntry(DictEntry *newEntry) { DicomDict = newEntry; }; + DocEntry(DictEntry*); + virtual ~DocEntry(); -// Variables /// \brief pointer to the underlying Dicom dictionary element DictEntry *DicomDict; - /// \brief Correspond to the real length of the datas + /// \brief Correspond to the real length of the data /// This length might always be even uint32_t Length; - /// \brief Length to read in the file to obtain datas. + /// \brief Length to read in the file to obtain data uint32_t ReadLength; /// \brief Even when reading explicit vr files, some elements happen to @@ -158,17 +144,10 @@ protected: /// breaking the underlying dictionary. bool ImplicitVR; - /// Offset from the begining of file for direct user access + /// Offset from the beginning of file for direct user access size_t Offset; - /// \brief Generalized key of this DocEntry (for details on - /// the generalized key refer to \ref TagKey documentation). - TagKey Key; - private: - // FIXME: In fact we should be more specific and use : - // friend DocEntry * Header::ReadNextElement(void); - friend class Header; }; } // end namespace gdcm //-----------------------------------------------------------------------------