From 74ca8b85ac694824c885c36b5ed199f69de406d2 Mon Sep 17 00:00:00 2001 From: jpr Date: Mon, 19 Jan 2004 14:46:34 +0000 Subject: [PATCH] gdcmSequence renamed to gdcmSerie, to comply with Dicom documentation. --- src/Makefile.am | 6 +++--- src/gdcmParser.cxx | 10 +++++----- src/gdcmSequence.cxx | 24 ------------------------ src/gdcmSerie.cxx | 24 ++++++++++++++++++++++++ src/{gdcmSequence.h => gdcmSerie.h} | 12 ++++++------ src/gdcmStudy.h | 8 ++++---- 6 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 src/gdcmSequence.cxx create mode 100644 src/gdcmSerie.cxx rename src/{gdcmSequence.h => gdcmSerie.h} (79%) diff --git a/src/Makefile.am b/src/Makefile.am index 31c6374d..4ce15447 100644 --- 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 8e2c0a07..dead892a 100644 --- 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 index b9a16c63..00000000 --- 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 index 00000000..18508e72 --- /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 6bf4426e..ed73cda1 100644 --- 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 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 6fc49c92..c595f054 100644 --- 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 lSequence; +typedef std::list 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; }; -- 2.45.1