X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocument.h;h=6a5538aeddaba9c110faa72aa26be6fe0733d88c;hb=ee91cee9d641284ed6a410f2af286bb681829055;hp=a024bdef0f19e4e2c42cb3013eec509d7ec5851f;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index a024bdef..6a5538ae 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2004/10/12 04:35:45 $ - Version: $Revision: 1.50 $ + Date: $Date: 2004/12/16 11:37:02 $ + Version: $Revision: 1.69 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,25 +19,41 @@ #ifndef GDCMDOCUMENT_H #define GDCMDOCUMENT_H -#include "gdcmCommon.h" #include "gdcmVR.h" -#include "gdcmTS.h" -#include "gdcmException.h" -#include "gdcmDictSet.h" -#include "gdcmDocEntry.h" -#include "gdcmRLEFramesInfo.h" -#include "gdcmJPEGFragmentsInfo.h" -#include "gdcmDocEntrySet.h" +#include "gdcmDict.h" #include "gdcmElementSet.h" -class ValEntry; -class BinEntry; -class SeqEntry; - #include #include +#include + namespace gdcm { +class ValEntry; +class BinEntry; +class SeqEntry; +class Dict; +class RLEFramesInfo; +class JPEGFragmentsInfo; + +enum TransferSyntaxType { + ImplicitVRLittleEndian = 0, + ImplicitVRLittleEndianDLXGE, + ExplicitVRLittleEndian, + DeflatedExplicitVRLittleEndian, + ExplicitVRBigEndian, + JPEGBaselineProcess1, + JPEGExtendedProcess2_4, + JPEGExtendedProcess3_5, + JPEGSpectralSelectionProcess6_8, + JPEGFullProgressionProcess10_12, + JPEGLosslessProcess14, + JPEGLosslessProcess14_1, + JPEG2000Lossless, + JPEG2000, + RLELossless, + UnknownTS +}; //----------------------------------------------------------------------------- /** @@ -48,11 +64,11 @@ class GDCM_EXPORT Document : public ElementSet friend class File; private: /// Public dictionary used to parse this header - Dict *RefPubDict; + Dict* RefPubDict; /// \brief Optional "shadow dictionary" (private elements) used to parse /// this header - Dict *RefShaDict; + Dict* RefShaDict; /// \brief Size threshold above which an element value will NOT be loaded /// in memory (to avoid loading the image/volume itself). By default, @@ -75,7 +91,7 @@ protected: int SwapCode; /// File Pointer, opened during Header parsing. - FILE *Fp; + std::ifstream* Fp; /// ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown FileType Filetype; @@ -90,72 +106,58 @@ protected: /// \brief Elements whose value is longer than MAX_SIZE_PRINT_ELEMENT_VALUE /// are NOT printed. /// \todo Currently not used since collides with #define in - /// \ref DocEntry.cxx. See also - /// \ref Document::SetMaxSizePrintEntry() + /// class DocEntry . See also + /// method ref Document::SetMaxSizePrintEntry() static const unsigned int MAX_SIZE_PRINT_ELEMENT_VALUE; /// Store the RLE frames info obtained during parsing of pixels. - RLEFramesInfo RLEInfo; + RLEFramesInfo* RLEInfo; /// Store the JPEG fragments info obtained during parsing of pixels. - JPEGFragmentsInfo JPEGInfo; + JPEGFragmentsInfo* JPEGInfo; - /// \brief Amount of printed details for each Header Entry (Dicom Element): - /// 0 : stands for the least detail level. - int PrintLevel; - public: // the 2 following will be merged virtual void PrintPubDict (std::ostream &os = std::cout); virtual void PrintShaDict (std::ostream &os = std::cout); // Dictionnaries - Dict *GetPubDict(); - Dict *GetShaDict(); - bool SetShaDict(Dict *dict); + Dict* GetPubDict(); + Dict* GetShaDict(); + bool SetShaDict(Dict* dict); bool SetShaDict(DictKey const & dictName); // Informations contained in the parser virtual bool IsReadable(); - bool IsGivenTransferSyntax(std::string const & syntaxToCheck); - bool IsImplicitVRLittleEndianTransferSyntax(); - bool IsExplicitVRLittleEndianTransferSyntax(); - bool IsDeflatedExplicitVRLittleEndianTransferSyntax(); - bool IsExplicitVRBigEndianTransferSyntax(); - bool IsRLELossLessTransferSyntax(); - bool IsJPEGBaseLineProcess1TransferSyntax(); - bool IsJPEGExtendedProcess2_4TransferSyntax(); - bool IsJPEGExtendedProcess3_5TransferSyntax(); - bool IsJPEGSpectralSelectionProcess6_8TransferSyntax(); + TransferSyntaxType GetTransferSyntax(); bool IsJPEGLossless(); bool IsJPEG2000(); - bool IsJPEGTransferSyntax(); - bool IsEncapsulateTransferSyntax(); + bool IsJPEG(); + bool IsEncapsulate(); bool IsDicomV3(); FileType GetFileType(); - FILE* OpenFile(); + std::ifstream * OpenFile(); bool CloseFile(); - void Write(FILE* fp, FileType type); + void WriteContent( std::ofstream* fp, FileType type ); ValEntry* ReplaceOrCreateByNumber(std::string const & value, - uint16_t group, uint16_t elem, - std::string const & VR ="unkn"); + uint16_t group, uint16_t elem, + TagName const & vr = "unkn"); BinEntry* ReplaceOrCreateByNumber(uint8_t* binArea, int lgth, - uint16_t group, uint16_t elem, - std::string const & VR="unkn"); + uint16_t group, uint16_t elem, + TagName const & vr = "unkn"); SeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem); bool ReplaceIfExistByNumber ( std::string const & value, - uint16_t group, - uint16_t elem ); + uint16_t group, uint16_t elem ); - virtual void* LoadEntryBinArea(uint16_t group, uint16_t elem); - virtual void* LoadEntryBinArea(BinEntry* entry); + virtual void LoadEntryBinArea(uint16_t group, uint16_t elem); + virtual void LoadEntryBinArea(BinEntry* entry); // System access (meaning endian related !?) uint16_t SwapShort(uint16_t); // needed by File @@ -163,6 +165,8 @@ public: uint16_t UnswapShort(uint16_t); // needed by File uint32_t UnswapLong(uint32_t); // needed by File + static std::string GetTransferSyntaxValue(TransferSyntaxType type); + protected: // Constructor and destructor are protected to forbid end user // to instanciate from this class Document (only Header and @@ -184,27 +188,28 @@ public: virtual int GetEntryLengthByNumber(uint16_t group, uint16_t elem); //protected: virtual bool SetEntryByName (std::string const & content, - std::string const & tagName); + TagName const & tagName ); virtual bool SetEntryByNumber(std::string const & content, uint16_t group, uint16_t element); virtual bool SetEntryByNumber(uint8_t* content, int lgth, uint16_t group, uint16_t element); - virtual bool SetEntryLengthByNumber(uint32_t length, - uint16_t group, uint16_t element); - - virtual size_t GetEntryOffsetByNumber (uint16_t group, uint16_t elem); virtual void* GetEntryBinAreaByNumber(uint16_t group, uint16_t elem); - virtual bool SetEntryBinAreaByNumber(uint8_t* a, uint16_t group, - uint16_t elem); + // FIXME + // Verify the usefull of this method... otherwise remove it + // It's body is commented in the .xx + //virtual bool SetEntryBinAreaByNumber(uint8_t* a, uint16_t group, + // uint16_t elem); virtual void UpdateShaEntries(); // Header entry DocEntry* GetDocEntryByNumber(uint16_t group, uint16_t element); - DocEntry* GetDocEntryByName (std::string const & tagName); + DocEntry* GetDocEntryByName (TagName const & tagName); ValEntry* GetValEntryByNumber(uint16_t group, uint16_t element); //BinEntry* GetBinEntryByNumber(uint16_t group, uint16_t element); + RLEFramesInfo* GetRLEInfo() { return RLEInfo; } + JPEGFragmentsInfo* GetJPEGInfo() { return JPEGInfo; } void LoadDocEntrySafe(DocEntry* entry); TagDocEntryHT* BuildFlatHashTable(); @@ -249,14 +254,11 @@ private: void BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, DocEntrySet* set ); - + void HandleBrokenEndian(uint16_t group, uint16_t elem); public: // Accessors: - /// Accessor to \ref PrintLevel - void SetPrintLevel(int level) { PrintLevel = level; } - /// Accessor to \ref Filename - const std::string &GetFileName() { return Filename; } + const std::string &GetFileName() const { return Filename; } /// Accessor to \ref Filename void SetFileName(std::string const & fileName) { Filename = fileName; } @@ -264,11 +266,7 @@ public: /// 'Swap code' accessor (see \ref SwapCode ) int GetSwapCode() { return SwapCode; } - /// File pointer - FILE * GetFP() { return Fp; } - bool operator<(Document &document); - }; } // end namespace gdcm