Program: gdcm
Module: $RCSfile: gdcmDocument.h,v $
Language: C++
- Date: $Date: 2004/07/02 13:55:27 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2004/09/17 13:11:16 $
+ Version: $Revision: 1.38 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/// \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,
/// \brief SWap code (e.g. Big Endian, Little Endian, Bad Big Endian,
/// Bad Little Endian) according to the processor Endianity and
/// what is written on disc.
- int sw;
+ int SwapCode;
/// File Pointer, opened during Header parsing.
- FILE *fp;
+ FILE *Fp;
/// ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown
FileType Filetype;
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;
+ int EnableSequences;
/// \brief Amount of printed details for each Header Entry (Dicom Element):
/// 0 : stands for the least detail level.
- int printLevel;
+ int PrintLevel;
public:
// the 2 following will be merged
gdcmDict *GetPubDict();
gdcmDict *GetShaDict();
bool SetShaDict(gdcmDict *dict);
- bool SetShaDict(DictKey dictName);
+ bool SetShaDict(DictKey const & dictName);
// Informations contained in the parser
virtual bool IsReadable();
- bool IsGivenTransferSyntax(const std::string & SyntaxToCheck);
+ bool IsGivenTransferSyntax(std::string const & syntaxToCheck);
bool IsImplicitVRLittleEndianTransferSyntax();
bool IsExplicitVRLittleEndianTransferSyntax();
bool IsDeflatedExplicitVRLittleEndianTransferSyntax();
FileType GetFileType();
- FILE* OpenFile(bool exception_on_error = false) throw(gdcmFileError);
+ FILE* OpenFile();
bool CloseFile();
- void Write(FILE* fp,FileType type);
-
- gdcmValEntry* ReplaceOrCreateByNumber(std::string Value,
- uint16_t Group, uint16_t Elem);
+ void Write(FILE* fp, FileType type);
+ gdcmValEntry* ReplaceOrCreateByNumber(std::string const & value,
+ uint16_t group, uint16_t elem,
+ std::string const & VR ="unkn");
+
gdcmBinEntry* ReplaceOrCreateByNumber(void *voidArea, int lgth,
- uint16_t Group, uint16_t Elem);
- bool ReplaceIfExistByNumber (char* Value, uint16_t Group, uint16_t Elem);
+ uint16_t group, uint16_t elem,
+ std::string const & VR="unkn");
+
+ gdcmSeqEntry* ReplaceOrCreateByNumber(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 Element);
- virtual void* LoadEntryVoidArea(gdcmBinEntry*);
+ virtual void* LoadEntryVoidArea(uint16_t group, uint16_t elem);
+ virtual void* LoadEntryVoidArea(gdcmBinEntry* entry);
- // System access
+ // System access (meaning endian related !?)
uint16_t SwapShort(uint16_t); // needed by gdcmFile
uint32_t SwapLong(uint32_t); // needed by gdcmFile
uint16_t UnswapShort(uint16_t); // needed by gdcmFile
// Constructor and destructor are protected to forbid end user
// to instanciate from this class gdcmDocument (only gdcmHeader and
// gdcmDicomDir are meaningfull).
- gdcmDocument(bool exception_on_error = false);
- gdcmDocument(std::string const & inFilename,
- bool exception_on_error = false,
- bool enable_sequences = false,
- bool ignore_shadow = false);
+ gdcmDocument();
+ gdcmDocument( std::string const & filename );
virtual ~gdcmDocument();
- void gdcmDocument::Parse7FE0 ();
+ void Parse7FE0 ();
// Entry
- int CheckIfEntryExistByNumber(uint16_t Group, uint16_t Elem ); // int !
+ bool CheckIfEntryExistByNumber(uint16_t group, uint16_t elem );
public:
- virtual std::string GetEntryByName (TagName tagName);
- virtual std::string GetEntryVRByName (TagName tagName);
- virtual std::string GetEntryByNumber (uint16_t group, uint16_t element);
- virtual std::string GetEntryVRByNumber(uint16_t group, uint16_t element);
- virtual int GetEntryLengthByNumber(uint16_t group, uint16_t element);
-protected:
- virtual bool SetEntryByName (std::string content, std::string tagName);
- virtual bool SetEntryByNumber(std::string content,
+ 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:
+ 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,
uint16_t group, uint16_t element);
virtual bool SetEntryLengthByNumber(uint32_t length,
- uint16_t group, uint16_t element);
+ 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,
- uint16_t Elem);
+ 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,
+ uint16_t elem);
virtual void UpdateShaEntries();
// Header entry
gdcmDocEntry* GetDocEntryByNumber(uint16_t group, uint16_t element);
- gdcmDocEntry* GetDocEntryByName (std::string Name);
+ gdcmDocEntry* GetDocEntryByName (std::string const & tagName);
gdcmValEntry* GetValEntryByNumber(uint16_t group, uint16_t element);
gdcmBinEntry* GetBinEntryByNumber(uint16_t group, uint16_t element);
- void LoadDocEntrySafe(gdcmDocEntry*);
+ 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);
+ 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 LoadDocEntry (gdcmDocEntry *);
- void FindDocEntryLength(gdcmDocEntry *);
+ void FindDocEntryLength(gdcmDocEntry *) throw ( gdcmFormatError );
void FindDocEntryVR (gdcmDocEntry *);
bool CheckDocEntryVR (gdcmDocEntry *, gdcmVRKey);
void FixDocEntryFoundLength(gdcmDocEntry *, uint32_t);
bool IsDocEntryAnInteger (gdcmDocEntry *);
- uint32_t FindDocEntryLengthOB();
+ uint32_t FindDocEntryLengthOB() throw( gdcmFormatUnexpected );
- uint16_t ReadInt16();
- uint32_t ReadInt32();
+ uint16_t ReadInt16() throw ( gdcmFormatError );
+ uint32_t ReadInt32() throw ( gdcmFormatError );
void SkipBytes(uint32_t);
bool ReadTag(uint16_t, uint16_t);
uint32_t ReadTagLength(uint16_t, uint16_t);
gdcmDocEntry* ReadNextDocEntry();
uint32_t GenerateFreeTagKeyInGroup(uint16_t group);
+ void BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
+ gdcmDocEntrySet* set );
+
public:
// Accessors:
- /// Accessor to \ref printLevel
- void SetPrintLevel(int level) { printLevel = level; }
+ /// Accessor to \ref PrintLevel
+ void SetPrintLevel(int level) { PrintLevel = level; }
/// Accessor to \ref Filename
- std::string &GetFileName() { return Filename; }
+ const std::string &GetFileName() { return Filename; }
/// Accessor to \ref Filename
- void SetFileName(const char* fileName) { Filename = fileName; }
-
- /// Accessor to \ref gdcmElementSet::tagHT
- TagDocEntryHT &GetEntry() { return tagHT; };
+ void SetFileName(std::string const & fileName) { Filename = fileName; }
- /// 'Swap code' accessor (see \ref sw )
- int GetSwapCode() { return sw; }
+ /// 'Swap code' accessor (see \ref SwapCode )
+ int GetSwapCode() { return SwapCode; }
/// File pointer
- FILE * GetFP() { return fp; }
+ FILE * GetFP() { return Fp; }
bool operator<(gdcmDocument &document);