X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.h;h=53a334014022ede434c306b0a4476ffc92c5a122;hb=8ac4df8c7543a827c7b89fc9bbcf86625f3c1afe;hp=5792c6417cf920e4e6c112075c0babe768499e38;hpb=cda99e070e95c3990119c503d6621ee845ae8d84;p=gdcm.git diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index 5792c641..53a33401 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/07/31 18:43:43 $ - Version: $Revision: 1.14 $ + Date: $Date: 2004/09/27 08:39:06 $ + Version: $Revision: 1.22 $ 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,8 +16,8 @@ =========================================================================*/ -#ifndef GDCMDocEntry_H -#define GDCMDocEntry_H +#ifndef GDCMDOCENTRY_H +#define GDCMDOCENTRY_H #include #include @@ -39,27 +39,31 @@ class GDCM_EXPORT gdcmDocEntry { public: gdcmDocEntry(gdcmDictEntry*); - + virtual ~gdcmDocEntry() {}; + /// Returns the Dicom Group number of the current Dicom Header Entry - uint16_t GetGroup() { return entry->GetGroup(); }; + uint16_t GetGroup() { return DictEntry->GetGroup(); }; /// Returns the Dicom Element number of the current Dicom Header Entry - uint16_t GetElement() { return entry->GetElement();}; + uint16_t GetElement() { return DictEntry->GetElement();}; + + /// Returns the 'key' of the current Dicom Header Entry + void SetKey( gdcmTagKey key ) { Key = key; } /// Returns the 'key' of the current Dicom Header Entry - std::string GetKey() { return entry->GetKey(); }; + std::string GetKey() { 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 GetName() { return DictEntry->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 GetVR() { return DictEntry->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; }; @@ -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(std::string const & v) { DictEntry->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,23 +108,23 @@ 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 DictEntry->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(gdcmDictEntry *newEntry) { DictEntry = newEntry; }; /// \brief Gets the DicEntry of the current Dicom Element /// @return The DicEntry of the current Dicom Element - gdcmDictEntry * GetDictEntry() { return entry; }; + gdcmDictEntry * GetDictEntry() { return DictEntry; }; /// \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); @@ -129,17 +133,9 @@ public: void Copy(gdcmDocEntry *doc); - bool isItemDelimitor(); - bool isSequenceDelimitor(); + bool IsItemDelimitor(); + bool IsSequenceDelimitor(); - /// \brief Gets the depth level of a Dicom header entry embedded in - /// a SeQuence - int GetDepthLevel() { return SQDepthLevel; } - - /// \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); @@ -149,7 +145,7 @@ protected: // Variables /// \brief pointer to the underlying Dicom dictionary element - gdcmDictEntry *entry; + gdcmDictEntry *DictEntry; /// \brief Updated from ReadLength, by FixFoungLentgh() for fixing a bug /// in the header or helping the parser going on @@ -169,10 +165,11 @@ 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 (i.e. a gdcmBaseTagKey prepending a gdcmTagKey) + /// of this gdcmDocEntry + gdcmTagKey Key; }; //-----------------------------------------------------------------------------