X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=28996c2817506e42b261b940cc7d8e796ca54974;hb=81b83abc1f19db44870ea35907c5f6a102ba5c64;hp=b89d15c558d36c1fbad41955fd630ca39551ae5b;hpb=9a1c462c4bd36bd29efc949d74332f3e19bb9638;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index b89d15c5..28996c28 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2005/08/29 13:05:01 $ - Version: $Revision: 1.120 $ + Date: $Date: 2006/05/30 08:10:19 $ + Version: $Revision: 1.141 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,20 +23,15 @@ #include "gdcmDict.h" #include "gdcmElementSet.h" #include "gdcmException.h" +#include "gdcmDebug.h" // for LEGACY +#include "gdcmCommandManager.h" #include #include #include -#define NO_SEQ 0x00000001 // Don't load odd groups -#define NO_SHADOW 0x00000002 // Don't load Sequences -#define NO_SHADOWSEQ 0x00000004 // Don't load Sequences if they belong - // to an odd group - // (*exclusive* from NO_SEQ and NO_SHADOW) namespace gdcm { -class ValEntry; -class BinEntry; class SeqEntry; class Dict; @@ -46,13 +41,16 @@ class Dict; */ class GDCM_EXPORT Document : public ElementSet { -public: + gdcmTypeMacro(Document); -typedef std::list ListElements; +public: + typedef std::list ListElements; // Loading //Deprecated : use SetFileName() + Load() - virtual bool Load( std::string const &filename ); +//#ifndef GDCM_LEGACY_REMOVE +// virtual bool Load( std::string const &filename ); +//#endif virtual bool Load( ); // Dictionaries @@ -62,6 +60,7 @@ typedef std::list ListElements; bool SetShaDict(DictKey const &dictName); // Informations contained in the gdcm::Document + bool IsParsable(); virtual bool IsReadable(); bool IsDicomV3(); bool IsPapyrus(); @@ -73,15 +72,6 @@ typedef std::list ListElements; // Swap code /// 'Swap code' accessor (see \ref SwapCode ) int GetSwapCode() { return SwapCode; } - // System access (meaning endian related !?) - uint16_t SwapShort(uint16_t); - uint32_t SwapLong(uint32_t); - /// \brief Unswaps back the bytes of 2-bytes long integer - /// so they agree with the processor order. - uint16_t UnswapShort(uint16_t a) { return SwapShort(a);} - /// \brief Unswaps back the bytes of 4-byte long integer - /// so they agree with the processor order. - uint32_t UnswapLong(uint32_t a) { return SwapLong(a);} // File I/O /// Accessor to \ref Filename @@ -95,11 +85,11 @@ typedef std::list ListElements; bool CloseFile(); void WriteContent( std::ofstream *fp, FileType type ); -// Content entries +// Data entries virtual void LoadEntryBinArea(uint16_t group, uint16_t elem); - virtual void LoadEntryBinArea(BinEntry *entry); + virtual void LoadEntryBinArea(DataEntry *entry); - void LoadDocEntrySafe(DocEntry *entry); + void SetMaxSizeLoadEntry(long); void AddForceLoadElement(uint16_t group, uint16_t elem); // Ordering of Documents @@ -107,7 +97,7 @@ typedef std::list ListElements; /** * \brief Sets the LoadMode as a boolean string. - * NO_SEQ, NO_SHADOW, NO_SHADOWSEQ + * LD_NOSEQ, LD_NOSHADOW, LD_NOSHADOWSEQ ... (nothing more, right now) * WARNING : before using NO_SHADOW, be sure *all* your files * contain accurate values in the 0x0000 element (if any) @@ -123,13 +113,18 @@ protected: // to instanciate from this class Document (only gdcm::File and // gdcm::DicomDir are meaningfull). Document(); - Document( std::string const &filename ); virtual ~Document(); - + + virtual void CallStartMethod(); + virtual void CallProgressMethod(); + virtual void CallEndMethod(); + uint16_t ReadInt16() throw ( FormatError ); uint32_t ReadInt32() throw ( FormatError ); - void SkipBytes(uint32_t); - int ComputeGroup0002Length( FileType filetype ); + + /// \brief skips bytes inside the source file + void SkipBytes(uint32_t nBytes) { Fp->seekg((long)nBytes, std::ios::cur);} + int ComputeGroup0002Length( ); // Variables /// Refering underlying filename. @@ -191,6 +186,18 @@ private: // Methods void Initialize(); bool DoTheLoadingDocumentJob(); + + // System access (meaning endian related !?) + uint16_t SwapShort(uint16_t); + uint32_t SwapLong(uint32_t); + double SwapDouble(double); + /// \brief Unswaps back the bytes of 2-bytes long integer + /// so they agree with the processor order. + uint16_t UnswapShort(uint16_t a) { return SwapShort(a);} + /// \brief Unswaps back the bytes of 4-byte long integer + /// so they agree with the processor order. + uint32_t UnswapLong(uint32_t a) { return SwapLong(a);} + // Read void ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode); void ParseSQ (SeqEntry *seq, long offset, long l_max, bool delim_mode); @@ -198,11 +205,8 @@ private: void LoadDocEntry (DocEntry *e, bool forceLoad = false); void FindDocEntryLength (DocEntry *e) throw ( FormatError ); uint32_t FindDocEntryLengthOBOrOW() throw( FormatUnexpected ); - std::string FindDocEntryVR(); - bool CheckDocEntryVR (VRKey k); - - std::string GetDocEntryValue (DocEntry *entry); - std::string GetDocEntryUnvalue(DocEntry *entry); + VRKey FindDocEntryVR(); + bool CheckDocEntryVR (const VRKey &k); void SkipDocEntry (DocEntry *entry); void SkipToNextDocEntry (DocEntry *entry); @@ -212,7 +216,6 @@ private: bool CheckSwap(); void SwitchByteSwapCode(); - void SetMaxSizeLoadEntry(long); // DocEntry related utilities DocEntry *ReadNextDocEntry(); @@ -222,6 +225,11 @@ private: DocEntry *Backtrack(DocEntry *docEntry); // Variables +protected: + /// value of the ??? for any progress bar + float Progress; + mutable bool Abort; + /// Public dictionary used to parse this header Dict *RefPubDict; /// \brief Optional "shadow dictionary" (private elements) used to parse @@ -233,7 +241,12 @@ private: /// this upper bound is fixed to 1024 bytes (which might look reasonable /// when one considers the definition of the various VR contents). uint32_t MaxSizeLoadEntry; - + + /// \brief to allow any inner method to know current tag Group number + uint16_t CurrentGroup; + /// \brief to allow any inner method to know current tag Element number + uint16_t CurrentElem; + // uint32_t GenerateFreeTagKeyInGroup(uint16_t group); // void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT, // DocEntrySet *set );