X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=c499c6a0ae0d38645073fbd63eeb985698ef4181;hb=f6fd616782f9811f1390c64c9a3e7beb50ca4a04;hp=24e1cd2ef666bd9b124abfaae6d2c6f89066ad06;hpb=ab62b1a706df8e2ab1fbf26fa5037d6c22293655;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 24e1cd2e..c499c6a0 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2004/08/02 16:42:14 $ - Version: $Revision: 1.30 $ + Date: $Date: 2004/10/06 21:30:02 $ + Version: $Revision: 1.47 $ 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 @@ -25,6 +25,7 @@ #include "gdcmException.h" #include "gdcmDictSet.h" #include "gdcmDocEntry.h" +#include "gdcmRLEFramesInfo.h" class gdcmValEntry; class gdcmBinEntry; @@ -50,10 +51,6 @@ private: /// \brief Optional "shadow dictionary" (private elements) used to parse /// this header gdcmDict *RefShaDict; - - /// \brief Equals =1 if user wants to skip shadow groups while parsing - /// (to save space) - int IgnoreShadow; /// \brief Size threshold above which an element value will NOT be loaded /// in memory (to avoid loading the image/volume itself). By default, @@ -95,8 +92,8 @@ protected: /// \ref gdcmDocument::SetMaxSizePrintEntry() static const unsigned int MAX_SIZE_PRINT_ELEMENT_VALUE; - /// Will be set 1 if user asks to 'go inside' the 'sequences' (VR = "SQ") - int EnableSequences; + /// Store the RLE frames info obtained during parsing of pixels. + gdcmRLEFramesInfo RLEInfo; /// \brief Amount of printed details for each Header Entry (Dicom Element): /// 0 : stands for the least detail level. @@ -127,6 +124,7 @@ public: bool IsRLELossLessTransferSyntax(); bool IsJPEGLossless(); bool IsJPEG2000(); + bool IsEncapsulateTransferSyntax(); bool IsDicomV3(); FileType GetFileType(); @@ -137,16 +135,21 @@ public: void Write(FILE* fp, FileType type); gdcmValEntry* ReplaceOrCreateByNumber(std::string const & value, - uint16_t group, uint16_t elem); + uint16_t group, uint16_t elem, + std::string const & VR ="unkn"); + + gdcmBinEntry* ReplaceOrCreateByNumber(uint8_t* binArea, int lgth, + uint16_t group, uint16_t elem, + std::string const & VR="unkn"); + + gdcmSeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem); - gdcmBinEntry* ReplaceOrCreateByNumber(void *voidArea, int lgth, - uint16_t group, uint16_t elem); bool ReplaceIfExistByNumber ( std::string const & value, uint16_t group, uint16_t elem ); - virtual void* LoadEntryVoidArea(uint16_t group, uint16_t elem); - virtual void* LoadEntryVoidArea(gdcmBinEntry* entry); + virtual void* LoadEntryBinArea(uint16_t group, uint16_t elem); + virtual void* LoadEntryBinArea(gdcmBinEntry* entry); // System access (meaning endian related !?) uint16_t SwapShort(uint16_t); // needed by gdcmFile @@ -162,28 +165,28 @@ protected: gdcmDocument( std::string const & filename ); virtual ~gdcmDocument(); - void Parse7FE0 (); + void ComputeRLEInfo(); // Entry - int CheckIfEntryExistByNumber(uint16_t group, uint16_t elem ); // int ! + bool CheckIfEntryExistByNumber(uint16_t group, uint16_t elem ); public: virtual std::string GetEntryByName (TagName const & tagName); virtual std::string GetEntryVRByName (TagName const & tagName); virtual std::string GetEntryByNumber (uint16_t group, uint16_t elem); virtual std::string GetEntryVRByNumber(uint16_t group, uint16_t elem); virtual int GetEntryLengthByNumber(uint16_t group, uint16_t elem); -protected: +//protected: virtual bool SetEntryByName (std::string const & content, std::string const & tagName); virtual bool SetEntryByNumber(std::string const & content, uint16_t group, uint16_t element); - virtual bool SetEntryByNumber(void *content, int lgth, + 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* GetEntryVoidAreaByNumber(uint16_t group, uint16_t elem); - virtual bool SetEntryVoidAreaByNumber(void* a, uint16_t group, + 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); virtual void UpdateShaEntries(); @@ -193,15 +196,16 @@ protected: gdcmDocEntry* GetDocEntryByName (std::string const & tagName); gdcmValEntry* GetValEntryByNumber(uint16_t group, uint16_t element); - gdcmBinEntry* GetBinEntryByNumber(uint16_t group, uint16_t element); + //gdcmBinEntry* GetBinEntryByNumber(uint16_t group, uint16_t element); void LoadDocEntrySafe(gdcmDocEntry* entry); + TagDocEntryHT* BuildFlatHashTable(); private: // Read - long ParseDES(gdcmDocEntrySet *set, long offset, long l_max,bool delim_mode); - long ParseSQ (gdcmSeqEntry *seq, long offset, long l_max, bool delim_mode); - + void ParseDES(gdcmDocEntrySet *set,long offset, long l_max, bool delim_mode); + void ParseSQ (gdcmSeqEntry *seq, long offset, long l_max, bool delim_mode); + void LoadDocEntry (gdcmDocEntry *); void FindDocEntryLength(gdcmDocEntry *) throw ( gdcmFormatError ); void FindDocEntryVR (gdcmDocEntry *); @@ -234,10 +238,13 @@ private: gdcmDocEntry* ReadNextDocEntry(); uint32_t GenerateFreeTagKeyInGroup(uint16_t group); + void BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, + gdcmDocEntrySet* set ); + public: // Accessors: - /// Accessor to \ref printLevel + /// Accessor to \ref PrintLevel void SetPrintLevel(int level) { PrintLevel = level; } /// Accessor to \ref Filename @@ -246,7 +253,7 @@ public: /// Accessor to \ref Filename void SetFileName(std::string const & fileName) { Filename = fileName; } - /// 'Swap code' accessor (see \ref sw ) + /// 'Swap code' accessor (see \ref SwapCode ) int GetSwapCode() { return SwapCode; } /// File pointer