X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.h;h=5dd19d657bef8ae1e5d8f1c410c8afef3bb8ecf1;hb=93748f382dadb5c9240c4156ce7bbe9dcc8da44f;hp=e2798a2651824e04dadba83128bd4ee05a764687;hpb=327dfe7647e3720b0f3125f9b19397cb9afc0ed3;p=gdcm.git diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index e2798a26..5dd19d65 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/06 20:03:27 $ - Version: $Revision: 1.34 $ + Date: $Date: 2005/01/19 15:58:00 $ + Version: $Revision: 1.39 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -64,38 +64,41 @@ public: /// Dictionnary, of the current Dicom Header Entry 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 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 ! @@ -113,9 +116,9 @@ public: /// @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(DictEntry *newEntry) { DicomDict = newEntry; }; + /// \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 Gets the DicEntry of the current Dicom Element /// @return The DicEntry of the current Dicom Element @@ -130,26 +133,24 @@ public: bool IsItemDelimitor(); bool IsSequenceDelimitor(); - virtual void Print (std::ostream &os = std::cout); - -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 + /// \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; }; +// Variables /// \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,6 +164,11 @@ protected: /// \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 //-----------------------------------------------------------------------------