// the declaration once you provided the definition of the method...
#include <string>
-#include <stddef.h> // For size_t
+#include <iostream>
+#include <stddef.h> // For size_t
+#include <stdio.h> // FIXME For FILE on GCC only
+#include <map> // The requirement for the hash table (or map) that
+ // we shall use:
+ // 1/ First, next, last (iterators)
+ // 2/ should be sortable (i.e. sorted by TagKey). This
+ // condition shall be droped since the Win32/VC++
+ // implementation doesn't look a sorted one. Pffff....
+ // 3/ Make sure we can setup some default size value,
+ // which should be around 4500 entries which is the
+ // average dictionary size (said JPR)
+#ifdef __GNUC__
+#include <stdint.h>
+#define guint16 uint16_t
+#define guint32 uint32_t
+#define g_malloc malloc
+#define g_free free
+#endif
+#ifdef _MSC_VER
#include <glib.h>
-#include <stdio.h>
-
-// The requirement for the hash table (or map) that we shall use:
-// 1/ First, next, last (iterators)
-// 2/ should be sortable (i.e. sorted by TagKey). This condition
-// shall be droped since the Win32/VC++ implementation doesn't look
-// a sorted one. Pffff....
-// 3/ Make sure we can setup some default size value, which should be
-// around 4500 entries which is the average dictionary size (said JPR)
-#include <map>
+#endif
+#ifdef _MSC_VER
+ using namespace std; // string type lives in the std namespace on VC++
+#endif
+#ifdef _MSC_VER
+#define GDCM_EXPORT __declspec( dllexport )
+#else
+#define GDCM_EXPORT
+#endif
// Tag based hash tables.
// We shall use as keys the strings (as the C++ type) obtained by
// gdcmDictEntry::TranslateToKey for this conversion function.
typedef string TagKey;
-class gdcmDictEntry {
+class GDCM_EXPORT gdcmDictEntry {
private:
guint16 group; // e.g. 0x0010
guint16 element; // e.g. 0x0010
public:
//CLEANME gdcmDictEntry();
gdcmDictEntry(guint16 group, guint16 element,
- string vr, string fourth, string vr);
+ string vr = "Unknown",
+ string fourth = "Unknown",
+ string name = "Unknown");
static TagKey TranslateToKey(guint16 group, guint16 element);
guint16 GetGroup(void) { return group;};
guint16 GetElement(void){return element;};
string GetVR(void) {return vr; };
- void SetVR(string in){vr = in; };
+ void SetVR(string);
+ bool IsVrUnknown(void);
string GetFourth(void) {return fourth;};
string GetName(void) {return name;};
string GetKey(void) {return key;};
// entries. There should be a single public dictionary (THE dictionary of
// the actual DICOM v3) but as many shadow dictionaries as imagers
// combined with all software versions...
-class gdcmDict {
+class GDCM_EXPORT gdcmDict {
string name;
string filename;
TagHT entries;
public:
- gdcmDict(char *FileName); // Read Dict from disk
+ gdcmDict(const char* FileName); // Read Dict from disk
// TODO Swig int AppendEntry(gdcmDictEntry* NewEntry);
gdcmDictEntry * GetTag(guint32 group, guint32 element);
void Print(ostream&);
// should avoid :
// * reloading an allready loaded dictionary.
// * having many in memory representations of the same dictionary.
-#define PUBDICTNAME "DicomV3Dict"
-#define PUBDICTFILENAME "../Dicts/dicomV3.dic"
typedef string DictKey;
typedef map<DictKey, gdcmDict*> DictSetHT;
-class gdcmDictSet {
+class GDCM_EXPORT gdcmDictSet {
private:
+ string DictPath; // Directory path to dictionaries
DictSetHT dicts;
int AppendDict(gdcmDict* NewDict);
- int LoadDictFromFile(char* filename, DictKey);
+ int LoadDictFromFile(string filename, DictKey);
+ void SetDictPath(void);
public:
gdcmDictSet(void); // loads THE DICOM v3 dictionary
// TODO Swig int LoadDictFromFile(string filename);
// The dicom header of a Dicom file contains a set of such ELement VALUES
// (when successfuly parsed against a given Dicom dictionary)
-class ElValue {
+class GDCM_EXPORT ElValue {
private:
gdcmDictEntry *entry;
guint32 LgrElem;
+ bool ImplicitVr; // Even when reading explicit vr files, some
+ // elements happen to be implicit. Flag them here
+ // since we can't use the entry->vr without breaking
+ // the underlying dictionary.
// Might prove of some interest (see _ID_DCM_ELEM)
// int Swap;
public:
string value; // used to be char * valeurElem
size_t Offset; // Offset from the begining of file for direct user access
ElValue(gdcmDictEntry*);
- void SetVR(string);
- string GetVR(void);
+ void SetDictEntry(gdcmDictEntry *NewEntry) { entry = NewEntry; };
+
+ bool IsVrUnknown(void) { return entry->IsVrUnknown(); };
void SetLength(guint32 l){LgrElem = l; };
void SetValue(string val){ value = val; };
void SetOffset(size_t of){ Offset = of; };
+ void SetImplicitVr(void) { ImplicitVr = true; };
+ bool IsImplicitVr(void) { return ImplicitVr; };
+ void SetVR(string);
+ string GetVR(void);
string GetValue(void) { return value; };
- guint32 GetLength(void) { return LgrElem; };
+ guint32 GetLength(void) { return LgrElem; };
size_t GetOffset(void) { return Offset; };
guint16 GetGroup(void) { return entry->GetGroup(); };
guint16 GetElement(void) { return entry->GetElement(); };
typedef map<TagKey, ElValue*> TagElValueHT;
typedef map<string, ElValue*> TagElValueNameHT;
// Container for a set of succefully parsed ElValues.
-class ElValSet {
+class GDCM_EXPORT ElValSet {
// We need both accesses with a TagKey and the Dicentry.Name
TagElValueHT tagHt;
TagElValueNameHT NameHt;
// Notes:
// * the gdcmHeader::Set*Tag* family members cannot be defined as protected
// (Swig limitations for as Has_a dependency between gdcmFile and gdcmHeader)
-class gdcmHeader {
+class GDCM_EXPORT gdcmHeader {
//FIXME sw should be qn EndianType !!!
//enum EndianType {
//LittleEndian,
//BigEndian,
//BadBigEndian};
private:
- // All instances share the same valur representation dictionary
+ // All instances share the same value representation dictionary
static VRHT *dicom_vr;
static gdcmDictSet* Dicts; // Global dictionary container
gdcmDict* RefPubDict; // Public Dictionary
void FindLength(ElValue *);
void FindVR(ElValue *);
void LoadElementValue(ElValue *);
+ void LoadElementValueSafe(ElValue *);
void SkipElementValue(ElValue *);
void InitVRDict(void);
- bool IsAnInteger(guint16, guint16, string, guint32);
+ void SwitchSwapToBigEndian(void);
+ void FixFoundLength(ElValue*, guint32);
+ bool IsAnInteger(ElValue *);
+ bool IsBigEndianTransferSyntax(void);
ElValue * ReadNextElement(void);
gdcmDictEntry * IsInDicts(guint32, guint32);
size_t GetPixelOffset(void);
// of C/C++ vs Python).
// TODO Swig string GetPubElValRepByName(string TagName);
// TODO Swig string GetPubElValRepByNumber(guint16 group, guint16 element);
- void PrintPubElVal(ostream &);
+ TagElValueHT & GetPubElVal(void) { return PubElVals.GetTagHt(); };
+ void PrintPubElVal(ostream & os = cout);
void PrintPubDict(ostream &);
// Same thing with the shadow :
////// QUESTION: this looks still like an open question wether the
////// relationship between a gdcmFile and gdcmHeader is of
////// type IS_A or HAS_A !
-class gdcmFile: gdcmHeader
+class GDCM_EXPORT gdcmFile: gdcmHeader
{
private:
void* Data;
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff