X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocEntry.h;h=269c50de5fb2dffc716db2713dfb4aeff9a38374;hb=831b4cec23815614ee2ceddff957e852d7a36fe9;hp=7399e23c67632e00418c81a6ffe31202cd913e75;hpb=e8439d97c8441809e9a5236e729bae1a25ffb418;p=gdcm.git diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index 7399e23c..269c50de 100644 --- a/src/gdcmDocEntry.h +++ b/src/gdcmDocEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.h,v $ Language: C++ - Date: $Date: 2004/11/16 14:48:19 $ - Version: $Revision: 1.29 $ + Date: $Date: 2005/01/16 04:50:41 $ + Version: $Revision: 1.38 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,22 +19,25 @@ #ifndef GDCMDOCENTRY_H #define GDCMDOCENTRY_H +#include "gdcmBase.h" #include "gdcmDictEntry.h" + #include +#include +namespace gdcm +{ class Header; class ValEntry; class BinEntry; class SeqEntry; -namespace gdcm -{ //----------------------------------------------------------------------------- /** * \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 +class GDCM_EXPORT DocEntry : public Base { public: DocEntry(DictEntry*); @@ -47,52 +50,58 @@ public: uint16_t GetElement() { return DicomDict->GetElement();}; /// Returns the 'key' of the current Dicom Header Entry - void SetKey( TagKey const & key ) { Key = key; } + void SetKey( TagKey const &key ) { Key = key; } /// Returns the 'key' of the current Dicom Header Entry - std::string const & GetKey() const { return Key; } + std::string const &GetKey() const { return Key; } /// \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(); }; + std::string 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(); }; + + /// Sets the 'Value Representation' of the current Dicom Header Entry + void SetVR( TagName const &v) { DicomDict->SetVR(v); }; + + /// Sets the 'Value Multiplicity' of the current Dicom Header 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; }; - /// \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 UsableLength; }; - + + /// \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 /// mandatoryly the one thats's used (in case on SQ, or delimiters, /// the usable length is set to zero) uint32_t GetReadLength() { return ReadLength; }; - /// Sets the 'Value Representation' of the current Dicom Header Entry - void SetVR( TagName const & v) { DicomDict->SetVR(v); }; - /// \brief Sets both 'Read Length' and 'Usable Length' of the current /// Dicom Header Entry - void SetLength(uint32_t l) { ReadLength = UsableLength = l; }; + void SetLength(uint32_t l) { Length = l; }; - // The following 3 members, for internal use only ! - - /// \brief Sets only 'Read Length' (*not* 'Usable Length') of the current - /// Dicom Header Entry - void SetReadLength(uint32_t l) { ReadLength = 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; }; + - /// \brief Sets only 'Usable Length' (*not* 'Read Length') of the current - /// Dicom Header Entry - void SetUsableLength(uint32_t l) { UsableLength = l; }; + // The following 3 members, for internal use only ! /// \brief Sets the offset of the Dicom Element /// \warning use with caution ! @@ -110,6 +119,10 @@ public: /// @return true if the VR is unknown bool IsVRUnknown() { return DicomDict->IsVRUnknown(); }; + /// \brief Tells us if the VM of the current Dicom Element is Unknown + /// @return true if the VM is unknown + bool IsVMUnknown() { return DicomDict->IsVMUnknown(); }; + /// \brief Sets the DicEntry of the current Dicom Element /// @param newEntry pointer to the DictEntry void SetDictEntry(DictEntry *newEntry) { DicomDict = newEntry; }; @@ -117,16 +130,8 @@ public: /// \brief Gets the DicEntry of the current Dicom Element /// @return The DicEntry of the current Dicom Element DictEntry * GetDictEntry() { return DicomDict; }; - - /// \brief Sets the print level for the Dicom Header Elements - /// \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy - void SetPrintLevel(int level) { PrintLevel = level; }; - - /// \brief Gets the print level for the Dicom Header Elements - int GetPrintLevel() { return PrintLevel; }; - virtual void Print (std::ostream & os = std::cout); - virtual void Write(std::ofstream *fp, FileType filetype); + virtual void WriteContent(std::ofstream *fp, FileType filetype); uint32_t GetFullLength(); @@ -135,10 +140,7 @@ public: bool IsItemDelimitor(); bool IsSequenceDelimitor(); -private: - // FIXME: In fact we should be more specific and use : - // friend DocEntry * Header::ReadNextElement(void); - friend class Header; + virtual void Print (std::ostream &os = std::cout, std::string const & indent = ""); protected: // Variables @@ -146,13 +148,11 @@ protected: /// \brief pointer to the underlying Dicom dictionary element DictEntry *DicomDict; - /// \brief Updated from ReadLength, by FixFoungLentgh() for fixing a bug - /// in the header or helping the parser going on - uint32_t UsableLength; + /// \brief Correspond to the real length of the datas + /// This length might always be even + uint32_t Length; - /// \brief Length actually read on disk (before FixFoundLength). ReadLength - /// will be updated only when FixFoundLength actually fixes a bug in the - /// header, not when it performs a trick to help the Parser going on. + /// \brief Length to read in the file to obtain datas. uint32_t ReadLength; /// \brief Even when reading explicit vr files, some elements happen to @@ -163,12 +163,14 @@ protected: /// Offset from the begining of file for direct user access size_t Offset; - /// How many details are to be printed (value : 0,1,2) - int PrintLevel; - /// \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 //-----------------------------------------------------------------------------