gdcmSequence renamed to gdcmSerie, to comply with Dicom documentation.

diff --git a/src/Makefile.am b/src/Makefile.am
index 31c6374d48c4d6fb4d59d176ef1016f562288565..4ce1544785e0ef9367dc306e9ef71bd7f8413a9a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,11 +29,11 @@ libgdcm_la_SOURCES=                \
    gdcmJpeg12.cxx                  \
    gdcmJpeg2000.cxx                \
    gdcmRLE.cxx                     \
-   gdcmParsePixels.cxx                   \
+   gdcmParsePixels.cxx             \
    gdcmDICOMDIR.cxx                \
    gdcmPatient.cxx                 \
    gdcmStudy.cxx                   \
-   gdcmSequence.cxx                \
+   gdcmSerie.cxx                   \
    gdcmImage.cxx
 
 
@@ -55,7 +55,7 @@ libgdcminclude_HEADERS =                \
        gdcmObject.h                    \
        gdcmPatient.h                   \
        gdcmStudy.h                     \
-       gdcmSequence.h                  \
+       gdcmSerie.h                     \
        gdcmImage.h
 
 

diff --git a/src/gdcmParser.cxx b/src/gdcmParser.cxx
index 8e2c0a075aea80161a55c53076e00d308e2da271..dead892a71c58282fb6357a89fa9a80c90fd6d94 100644 (file)
--- a/src/gdcmParser.cxx
+++ b/src/gdcmParser.cxx
@@ -2076,11 +2076,11 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByName(std::string Name)
 /**
  * \ingroup gdcmParser
  * \brief   Request a new virtual dict entry to the dict set
- * @param   Group  group   of the underlying DictEntry
- * @param   Elem   element of the underlying DictEntry
- * @param   VR     VR of the underlying DictEntry
- * @param   Fourth owner group
- * @param   Name   english name
+ * @param   group  group   of the underlying DictEntry
+ * @param   elem   element of the underlying DictEntry
+ * @param   vr     VR of the underlying DictEntry
+ * @param   fourth owner group
+ * @param   name   english name
  */
 gdcmDictEntry *gdcmParser::NewVirtualDictEntry(guint16 group, guint16 element,
                                                std::string vr,

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

diff --git a/src/gdcmSequence.h b/src/gdcmSerie.h
similarity index 79%
rename from src/gdcmSequence.h
rename to src/gdcmSerie.h
index 6bf4426e69bcfb6e22c0316035ef3fffa1f5bc2f..ed73cda1f899e123e6527795350ddd6d927dbfda 100644 (file)
--- a/src/gdcmSequence.h
+++ b/src/gdcmSerie.h
@@ -1,7 +1,7 @@
-// gdcmSequence.h
+// gdcmSerie.h
 //-----------------------------------------------------------------------------
-#ifndef GDCMSEQUENCE_H
-#define GDCMSEQUENCE_H
+#ifndef GDCMSERIE_H
+#define GDCMSERIE_H
 
 #include "gdcmObject.h"
 #include "gdcmImage.h"
@@ -12,11 +12,11 @@ typedef std::list<gdcmImage> lImage;
 
 //-----------------------------------------------------------------------------
 
-class GDCM_EXPORT gdcmSequence : public gdcmObject {
+class GDCM_EXPORT gdcmSerie : public gdcmObject {
 public:
 
-   gdcmSequence();
-   ~gdcmSequence();
+   gdcmSerie();
+   ~gdcmSerie();
 
    std::string GetEntryByNumber(guint16 group, guint16 element);
    std::string GetEntryByName(TagName name);

diff --git a/src/gdcmStudy.h b/src/gdcmStudy.h
index 6fc49c920c79db6d242227e0c8b930668ff367c7..c595f054768c893b4701af835c31f79526ec4650 100644 (file)
--- a/src/gdcmStudy.h
+++ b/src/gdcmStudy.h
@@ -4,11 +4,11 @@
 #define GDCMSTUDY_H
 
 #include "gdcmObject.h"
-#include "gdcmSequence.h"
+#include "gdcmSerie.h"
 
 //-----------------------------------------------------------------------------
 
-typedef std::list<gdcmSequence> lSequence;
+typedef std::list<gdcmSerie> lSerie;
 
 //-----------------------------------------------------------------------------
 
@@ -21,11 +21,11 @@ public:
    std::string GetEntryByNumber(guint16 group, guint16 element);
    std::string GetEntryByName(TagName name);
 
-   inline lSequence GetSequences() {return sequences;};
+   inline lSerie GetSeries() {return series;};
 
 private:
 
-   lSequence sequences;
+   lSerie series;
 
 };