typedef std::string VRAtr;
typedef std::map<VRKey, VRAtr> VRHT; // Value Representation Hash Table
-typedef std::multimap<TagKey, gdcmHeaderEntry*> TagHeaderEntryHT;
-typedef std::pair<TagKey, gdcmHeaderEntry*> PairHT;
+typedef std::multimap<TagKey, gdcmHeaderEntry *> TagHeaderEntryHT;
+typedef std::pair<TagKey, gdcmHeaderEntry *> PairHT;
typedef std::pair<TagHeaderEntryHT::iterator,TagHeaderEntryHT::iterator> IterHT;
-typedef std::list<gdcmHeaderEntry*> ListTag; // for linking together the Elements
+typedef std::list<gdcmHeaderEntry *> ListTag; // for linking together the Elements
typedef std::string GroupKey;
typedef std::map<GroupKey, int> GroupHT;
//-----------------------------------------------------------------------------
/*
- * \defgroup gdcmHeader
- * \brief
+ * \defgroup gdcmParser
+ * \brief used by both gdcmHeader and gdcmDicomDir
*/
class GDCM_EXPORT gdcmParser
{
public:
- gdcmParser(bool exception_on_error = false);
+ gdcmParser(bool exception_on_error = false);
gdcmParser(const char *filename,
bool exception_on_error = false,
- bool enable_sequences = false);
+ bool enable_sequences = false,
+ bool ignore_shadow = false);
virtual ~gdcmParser(void);
// Print
* \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy
*/
void SetPrintLevel(int level) { printLevel = level; };
- virtual void PrintPubEntry(std::ostream &os = std::cout);
+ virtual void PrintEntry (std::ostream &os = std::cout);
virtual void PrintPubDict (std::ostream &os = std::cout);
virtual void PrintShaDict (std::ostream &os = std::cout);
bool SetShaDict(DictKey dictName);
// Informations contained in the parser
- bool IsReadable(void);
+ virtual bool IsReadable(void);
bool IsImplicitVRLittleEndianTransferSyntax(void);
bool IsExplicitVRLittleEndianTransferSyntax(void);
bool IsDeflatedExplicitVRLittleEndianTransferSyntax(void);
// System access
inline int GetSwapCode(void) { return sw; }
- guint16 SwapShort(guint16); // needed by gdcmFile
- guint32 SwapLong(guint32); // for JPEG Files
+ guint16 GetGrPixel(void) {return GrPixel;}
+ guint16 GetNumPixel(void) {return NumPixel;}
+
+ guint16 SwapShort(guint16); // needed by gdcmFile
+ guint32 SwapLong(guint32); // needed by gdcmFile
+ guint16 UnswapShort(guint16); // needed by gdcmFile
+ guint32 UnswapLong(guint32); // needed by gdcmFile
protected:
// Entry
virtual void *LoadEntryVoidArea (guint16 Group, guint16 Element);
virtual bool SetEntryVoidAreaByNumber(void *a, guint16 Group, guint16 Elem);
+ virtual void UpdateShaEntries(void);
+
// Header entry
- gdcmHeaderEntry *GetHeaderEntryByName (std::string Name);
- gdcmHeaderEntry *GetHeaderEntryByNumber(guint16 group, guint16 element);
+ gdcmHeaderEntry *GetHeaderEntryByNumber (guint16 group, guint16 element);
+ gdcmHeaderEntry *GetHeaderEntryByName (std::string Name);
+ IterHT GetHeaderEntrySameNumber(guint16 group, guint16 element);
+// IterHT GetHeaderEntrySameName (std::string Name);
- void LoadHeaderEntrySafe (gdcmHeaderEntry *);
+ void LoadHeaderEntrySafe(gdcmHeaderEntry *);
void UpdateGroupLength(bool SkipSequence = false, FileType type = ImplicitVR);
void WriteEntries(FileType type, FILE *);
static const unsigned int HEADER_LENGTH_TO_READ;
static const unsigned int MAX_SIZE_LOAD_ELEMENT_VALUE;
+ static const unsigned int MAX_SIZE_PRINT_ELEMENT_VALUE;
+protected:
+ TagHeaderEntryHT tagHT; // H Table (multimap), to provide fast access
+ ListTag listEntries; // chained list, to keep the 'spacial' ordering
+
+ int enableSequences;
+ int printLevel;
+
+ // For some ACR-NEMA images, it's *not* 7fe0, 0010 ...
+ guint16 GrPixel;
+ guint16 NumPixel;
+ // some files may contain icons; GrPixel,NumPixel appears several times
+ // Let's remember how many times!
+ int countGrPixel;
+
private:
// Read
- void Parse(bool exception_on_error = false) throw(gdcmFormatError);
+ bool ParseHeader(bool exception_on_error = false) throw(gdcmFormatError);
void LoadHeaderEntries (void);
void LoadHeaderEntry (gdcmHeaderEntry *);
void AddHeaderEntry (gdcmHeaderEntry *);
void FindHeaderEntryLength(gdcmHeaderEntry *);
void FindHeaderEntryVR (gdcmHeaderEntry *);
+ bool CheckHeaderEntryVR (gdcmHeaderEntry *, VRKey);
+
+ std::string GetHeaderEntryValue (gdcmHeaderEntry *);
+ std::string GetHeaderEntryUnvalue(gdcmHeaderEntry *);
void SkipHeaderEntry (gdcmHeaderEntry *);
void FixHeaderEntryFoundLength(gdcmHeaderEntry *, guint32);
void SkipBytes(guint32);
void Initialise(void);
- void CheckSwap(void);
+ bool CheckSwap(void);
void SwitchSwapToBigEndian(void);
void SetMaxSizeLoadEntry(long);
+ void SetMaxSizePrintEntry(long);
- // Dict
+ // DictEntry related utilities
gdcmDictEntry *GetDictEntryByName (std::string Name);
gdcmDictEntry *GetDictEntryByNumber(guint16, guint16);
-
+ gdcmDictEntry *NewVirtualDictEntry(guint16 group,
+ guint16 element,
+ std::string vr = "unkn",
+ std::string fourth = "unkn",
+ std::string name = "unkn");
+ gdcmDictEntry *NewVirtualDictEntry(gdcmHeaderEntry *);
+
// HeaderEntry related utilities
gdcmHeaderEntry *ReadNextHeaderEntry (void);
- gdcmHeaderEntry *NewHeaderEntryByNumber(guint16 group, guint16 element);
+ gdcmHeaderEntry *NewHeaderEntryByNumber(guint16 group,
+ guint16 element);
gdcmHeaderEntry *NewHeaderEntryByName (std::string Name);
- gdcmDictEntry *NewVirtualDictEntry(guint16 group, guint16 element,
- std::string vr = "Unknown",
- std::string fourth = "Unknown",
- std::string name = "Unknown");
-
- // Deprecated (Not used)
- gdcmHeaderEntry *NewManualHeaderEntryToPubDict(std::string NewTagName,
- std::string VR);
+
+
+ // Deprecated (Not used) --> commented out
+ //gdcmHeaderEntry *NewManualHeaderEntryToPubDict(std::string NewTagName,
+ // std::string VR);
guint32 GenerateFreeTagKeyInGroup(guint16 group);
// Refering underlying filename.
// Optional "shadow dictionary" (private elements) used to parse this header
gdcmDict *RefShaDict;
- TagHeaderEntryHT tagHT; // H Table (multimap), to provide fast access
- ListTag listEntries; // chained list, to keep the 'spacial' ordering
- int enableSequences;
-
- // true if a gdcmHeaderEntry was added post parsing
+ // = 1 if a gdcmHeaderEntry was added post parsing
int wasUpdated;
+
+ // =1 if user wants to skip shadow groups while parsing (to save space)
+ int ignoreShadow;
// Swap code e.g. little, big, bad-big, bad-little endian). Warning:
// this code is not fixed during header parsing.
// this upper bound is fixed to 1024 bytes (which might look reasonable
// when one considers the definition of the various VR contents).
guint32 MaxSizeLoadEntry;
-
- // for PrintHeader
- int printLevel;
+ // Size treshold above which an element value will NOT be *printed* in
+ // order no to polute the screen output. By default,
+ // this upper bound is fixed to 64 bytes.
+ guint32 MaxSizePrintEntry;
+
};
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff