NEW : gdcmDICOMDIR, gdcmPatient, gdcmStudy, gdcmSequence and gdcmImage objects.

These are following last friday's meeting.

This collection of objects is designed to represents a DICOMDIR file in memory.
These are only empty templates bound to be completed by JPR

diff --git a/src/gdcmImage.cxx b/src/gdcmImage.cxx
new file mode 100644 (file)
index 0000000..245a6a4
--- /dev/null
+++ b/src/gdcmImage.cxx
@@ -0,0 +1,24 @@
+// gdcmImage.cxx
+//-----------------------------------------------------------------------------
+#include "gdcmImage.h"
+
+gdcmImage::gdcmImage() {
+
+}
+
+
+gdcmImage::~gdcmImage() {
+
+}
+
+
+
+std::string gdcmImage::GetEntryByNumber(guint16 group, guint16 element) {
+    return "";
+}
+
+
+std::string gdcmImage::GetEntryByName(TagName name) {
+    return "";
+}
+

diff --git a/src/gdcmImage.h b/src/gdcmImage.h
new file mode 100644 (file)
index 0000000..5b75aae
--- /dev/null
+++ b/src/gdcmImage.h
@@ -0,0 +1,26 @@
+// gdcmImage.h
+//-----------------------------------------------------------------------------
+#ifndef GDCMIMAGE_H
+#define GDCMIMAGE_H
+
+#include "gdcmObject.h"
+
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+
+class GDCM_EXPORT gdcmImage : public gdcmObject {
+public:
+
+   gdcmImage();
+   ~gdcmImage();
+
+   std::string GetEntryByNumber(guint16 group, guint16 element);
+   std::string GetEntryByName(TagName name);
+
+
+};
+
+//-----------------------------------------------------------------------------
+#endif

diff --git a/src/gdcmObject.h b/src/gdcmObject.h
new file mode 100644 (file)
index 0000000..f2f65c0
--- /dev/null
+++ b/src/gdcmObject.h
@@ -0,0 +1,35 @@
+// gdcmObject.h
+//-----------------------------------------------------------------------------
+#ifndef GDCMOBJECT_H
+#define GDCMOBJECT_H
+
+#include <string>
+#include <list>
+#include "gdcmCommon.h"
+
+
+//-----------------------------------------------------------------------------
+
+typedef std::list<std::string> lstring;
+
+//-----------------------------------------------------------------------------
+
+class gdcmObject {
+public:
+
+   virtual std::string GetEntryByNumber(guint16 group, guint16 element)=0;
+   virtual std::string GetEntryByName(TagName name)=0;
+
+protected:
+
+   //to modify (I don't know the list type) : both iterators (beginning and end)
+   lstring::iterator beginIter;
+   lstring::iterator endIter;
+
+   //pointer to the data list
+   lstring *objectData;
+
+};
+
+//-----------------------------------------------------------------------------
+#endif

diff --git a/src/gdcmPatient.cxx b/src/gdcmPatient.cxx
new file mode 100644 (file)
index 0000000..4e952e4
--- /dev/null
+++ b/src/gdcmPatient.cxx
@@ -0,0 +1,24 @@
+// gdcmPatient.cxx
+//-----------------------------------------------------------------------------
+#include "gdcmPatient.h"
+
+gdcmPatient::gdcmPatient() {
+
+}
+
+
+gdcmPatient::~gdcmPatient() {
+
+}
+
+
+
+std::string gdcmPatient::GetEntryByNumber(guint16 group, guint16 element) {
+    return "";
+}
+
+
+std::string gdcmPatient::GetEntryByName(TagName name) {
+    return "";
+}
+

diff --git a/src/gdcmPatient.h b/src/gdcmPatient.h
new file mode 100644 (file)
index 0000000..6640a5f
--- /dev/null
+++ b/src/gdcmPatient.h
@@ -0,0 +1,33 @@
+// gdcmPatient.h
+//-----------------------------------------------------------------------------
+#ifndef GDCMPATIENT_H
+#define GDCMPATIENT_H
+
+#include "gdcmObject.h"
+#include "gdcmStudy.h"
+
+//-----------------------------------------------------------------------------
+
+typedef std::list<gdcmStudy> lStudy;
+
+//-----------------------------------------------------------------------------
+
+class GDCM_EXPORT gdcmPatient : public gdcmObject {    //
+public:
+
+   gdcmPatient();
+   ~gdcmPatient();
+
+   std::string GetEntryByNumber(guint16 group, guint16 element);
+   std::string GetEntryByName(TagName name);
+
+   inline lStudy GetStudies() {return studies;};
+
+private:
+
+   lStudy studies;
+
+};
+
+//-----------------------------------------------------------------------------
+#endif

diff --git a/src/gdcmSequence.cxx b/src/gdcmSequence.cxx
new file mode 100644 (file)
index 0000000..b9a16c6
--- /dev/null
+++ b/src/gdcmSequence.cxx
@@ -0,0 +1,24 @@
+// gdcmSequence.cxx
+//-----------------------------------------------------------------------------
+#include "gdcmSequence.h"
+
+gdcmSequence::gdcmSequence() {
+
+}
+
+
+gdcmSequence::~gdcmSequence() {
+
+}
+
+
+
+std::string gdcmSequence::GetEntryByNumber(guint16 group, guint16 element) {
+    return "";
+}
+
+
+std::string gdcmSequence::GetEntryByName(TagName name) {
+    return "";
+}
+

diff --git a/src/gdcmSequence.h b/src/gdcmSequence.h
new file mode 100644 (file)
index 0000000..6bf4426
--- /dev/null
+++ b/src/gdcmSequence.h
@@ -0,0 +1,33 @@
+// gdcmSequence.h
+//-----------------------------------------------------------------------------
+#ifndef GDCMSEQUENCE_H
+#define GDCMSEQUENCE_H
+
+#include "gdcmObject.h"
+#include "gdcmImage.h"
+
+//-----------------------------------------------------------------------------
+
+typedef std::list<gdcmImage> lImage;
+
+//-----------------------------------------------------------------------------
+
+class GDCM_EXPORT gdcmSequence : public gdcmObject {
+public:
+
+   gdcmSequence();
+   ~gdcmSequence();
+
+   std::string GetEntryByNumber(guint16 group, guint16 element);
+   std::string GetEntryByName(TagName name);
+
+   inline lImage GetImages() {return images;};
+
+private:
+
+   lImage images;
+
+};
+
+//-----------------------------------------------------------------------------
+#endif

diff --git a/src/gdcmStudy.cxx b/src/gdcmStudy.cxx
new file mode 100644 (file)
index 0000000..bcfb0e3
--- /dev/null
+++ b/src/gdcmStudy.cxx
@@ -0,0 +1,24 @@
+// gdcmStudy.cxx
+//-----------------------------------------------------------------------------
+#include "gdcmStudy.h"
+
+gdcmStudy::gdcmStudy() {
+
+}
+
+
+gdcmStudy::~gdcmStudy() {
+
+}
+
+
+
+std::string gdcmStudy::GetEntryByNumber(guint16 group, guint16 element) {
+    return "";
+}
+
+
+std::string gdcmStudy::GetEntryByName(TagName name) {
+    return "";
+}
+

diff --git a/src/gdcmStudy.h b/src/gdcmStudy.h
new file mode 100644 (file)
index 0000000..6fc49c9
--- /dev/null
+++ b/src/gdcmStudy.h
@@ -0,0 +1,33 @@
+// gdcmStudy.h
+//-----------------------------------------------------------------------------
+#ifndef GDCMSTUDY_H
+#define GDCMSTUDY_H
+
+#include "gdcmObject.h"
+#include "gdcmSequence.h"
+
+//-----------------------------------------------------------------------------
+
+typedef std::list<gdcmSequence> lSequence;
+
+//-----------------------------------------------------------------------------
+
+class GDCM_EXPORT gdcmStudy : public gdcmObject {
+public:
+
+   gdcmStudy();
+   ~gdcmStudy();
+
+   std::string GetEntryByNumber(guint16 group, guint16 element);
+   std::string GetEntryByName(TagName name);
+
+   inline lSequence GetSequences() {return sequences;};
+
+private:
+
+   lSequence sequences;
+
+};
+
+//-----------------------------------------------------------------------------
+#endif