X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocEntry.h;h=7373c7287ece0122cf4c673995af4ce2aa3dbe36;hb=3ba8c03aa6cb08add6599a1ec7b2b693a967db62;hp=9f7a59a65c4b8a91f38e3b1aa2f9360aec16e032;hpb=49c0af19f5bf0f2402d37d8abf7fb139e7453245;p=gdcm.git diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index 9f7a59a6..7373c728 100644 --- a/src/gdcmDocEntry.h +++ b/src/gdcmDocEntry.h @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.h,v $ Language: C++ - Date: $Date: 2004/08/01 00:59:21 $ - Version: $Revision: 1.15 $ + Date: $Date: 2004/11/30 16:24:31 $ + Version: $Revision: 1.31 $ 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 @@ -16,52 +16,56 @@ =========================================================================*/ -#ifndef GDCMDocEntry_H -#define GDCMDocEntry_H - -#include -#include +#ifndef GDCMDOCENTRY_H +#define GDCMDOCENTRY_H #include "gdcmDictEntry.h" +#include +#include -class gdcmHeader; -class gdcmValEntry; -class gdcmBinEntry; -class gdcmSeqEntry; +class Header; +class ValEntry; +class BinEntry; +class SeqEntry; +namespace gdcm +{ //----------------------------------------------------------------------------- /** - * \ingroup gdcmDocEntry * \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 gdcmDocEntry +class GDCM_EXPORT DocEntry { public: - gdcmDocEntry(gdcmDictEntry*); + DocEntry(DictEntry*); + virtual ~DocEntry() {}; /// Returns the Dicom Group number of the current Dicom Header Entry - uint16_t GetGroup() { return entry->GetGroup(); }; + uint16_t GetGroup() { return DicomDict->GetGroup(); }; /// Returns the Dicom Element number of the current Dicom Header Entry - uint16_t GetElement() { return entry->GetElement();}; + uint16_t GetElement() { return DicomDict->GetElement();}; + + /// Returns the 'key' of the current Dicom Header Entry + void SetKey( TagKey const & key ) { Key = key; } /// Returns the 'key' of the current Dicom Header Entry - std::string GetKey() { return entry->GetKey(); }; + 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 GetName() { return entry->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 GetVR() { return entry->GetVR(); }; + std::string const & GetVR() const { return DicomDict->GetVR(); }; /// \brief Returns offset (since the beginning of the file, including - /// the File Pramble, if any) of the value of the current Dicom HeaderEntry + /// 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; }; + 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 @@ -75,17 +79,17 @@ public: uint32_t GetReadLength() { return ReadLength; }; /// Sets the 'Value Representation' of the current Dicom Header Entry - void SetVR(std::string const & v) { entry->SetVR(v); }; + 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) { ReadLength = UsableLength = 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; }; + void SetReadLength(uint32_t l) { ReadLength = l; }; /// \brief Sets only 'Usable Length' (*not* 'Read Length') of the current /// Dicom Header Entry @@ -104,52 +108,44 @@ public: bool IsImplicitVR() { return ImplicitVR; }; /// \brief Tells us if the VR of the current Dicom Element is Unknown - /// @return true if the VR is unkonwn - bool IsVRUnknown() { return entry->IsVRUnknown(); }; + /// @return true if the VR is unknown + bool IsVRUnknown() { return DicomDict->IsVRUnknown(); }; /// \brief Sets the DicEntry of the current Dicom Element - /// @param NewEntry pointer to the DictEntry - void SetDictEntry(gdcmDictEntry *NewEntry) { entry = NewEntry; }; + /// @param newEntry pointer to the DictEntry + void SetDictEntry(DictEntry *newEntry) { DicomDict = newEntry; }; /// \brief Gets the DicEntry of the current Dicom Element /// @return The DicEntry of the current Dicom Element - gdcmDictEntry * GetDictEntry() { return entry; }; + 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; }; + void SetPrintLevel(int level) { PrintLevel = level; }; /// \brief Gets the print level for the Dicom Header Elements - int GetPrintLevel() { return printLevel; }; + int GetPrintLevel() { return PrintLevel; }; virtual void Print (std::ostream & os = std::cout); - virtual void Write(FILE *fp, FileType filetype); + virtual void WriteContent(std::ofstream *fp, FileType filetype); uint32_t GetFullLength(); - void Copy(gdcmDocEntry *doc); - - bool isItemDelimitor(); - bool isSequenceDelimitor(); + void Copy(DocEntry *doc); - /// \brief Gets the depth level of a Dicom header entry embedded in - /// a SeQuence - int GetDepthLevel() { return SQDepthLevel; } + bool IsItemDelimitor(); + bool IsSequenceDelimitor(); - /// \brief Sets the depth level of a Dicom header entry embedded in - /// a SeQuence - void SetDepthLevel(int depth) {SQDepthLevel = depth;} - private: // FIXME: In fact we should be more specific and use : - // friend gdcmDocEntry * gdcmHeader::ReadNextElement(void); - friend class gdcmHeader; + // friend DocEntry * Header::ReadNextElement(void); + friend class Header; protected: // Variables /// \brief pointer to the underlying Dicom dictionary element - gdcmDictEntry *entry; + DictEntry *DicomDict; /// \brief Updated from ReadLength, by FixFoungLentgh() for fixing a bug /// in the header or helping the parser going on @@ -169,11 +165,12 @@ protected: size_t Offset; /// How many details are to be printed (value : 0,1,2) - int printLevel; - - /// Gives the depth level of elements inside SeQuences - int SQDepthLevel; -}; + int PrintLevel; + /// \brief Generalized key of this DocEntry (for details on + /// the generalized key refer to \ref TagKey documentation). + TagKey Key; +}; +} // end namespace gdcm //----------------------------------------------------------------------------- #endif