From 00be59e3db4bb1efcb3ac7980822863d1f7b92e5 Mon Sep 17 00:00:00 2001 From: jpr Date: Wed, 5 May 2004 08:22:51 +0000 Subject: [PATCH] about compile errors --- src/gdcmBinEntry.cxx | 14 +++++++------- src/gdcmBinEntry.h | 13 +++++++++++++ src/gdcmDocEntry.cxx | 18 ++++++++++++------ src/gdcmDocEntry.h | 15 --------------- src/gdcmDocEntrySet.cxx | 3 --- src/gdcmDocEntrySet.h | 12 ++++++++---- src/gdcmValEntry.h | 17 +++++++++++++++-- 7 files changed, 55 insertions(+), 37 deletions(-) diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index 9d09f7ad..6332c431 100644 --- a/src/gdcmBinEntry.cxx +++ b/src/gdcmBinEntry.cxx @@ -2,24 +2,24 @@ //----------------------------------------------------------------------------- // #include "gdcmBinEntry.h" -#include "gdcmTS.h" -#include "gdcmGlobal.h" -#include "gdcmUtil.h" //----------------------------------------------------------------------------- // Constructor / Destructor + /** - * \ingroup gdcmBinEntry * \brief Constructor from a given gdcmBinEntry - * @param in Pointer to existing dictionary entry */ -gdcmBinEntry::gdcmBinEntry() : gdcmDocEntry( ) { - +gdcmBinEntry::gdcmBinEntry() : gdcmValEntry() { } +/** + * \brief Canonical destructor. + */ +gdcmBinEntry::~gdcmBinEntry(){ +} //----------------------------------------------------------------------------- diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h index 76569f53..e8beab61 100644 --- a/src/gdcmBinEntry.h +++ b/src/gdcmBinEntry.h @@ -6,6 +6,8 @@ #include #include +#include "gdcmValEntry.h" + //----------------------------------------------------------------------------- /** * \ingroup gdcmBinEntry @@ -17,6 +19,17 @@ class GDCM_EXPORT gdcmBinEntry : public gdcmValEntry { public: + gdcmBinEntry(void); + ~gdcmBinEntry(void); + + + /// \brief Returns the area value of the current Dicom Header Entry + /// when it's not string-translatable (e.g : a LUT table) + inline void * GetVoidArea(void) { return voidArea; }; + + /// Sets the value (non string) of the current Dicom Header Entry + inline void SetVoidArea(void * area) { voidArea = area; }; + protected: private: diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 7351409e..8c50e202 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -30,6 +30,10 @@ gdcmDocEntry::gdcmDocEntry(gdcmDictEntry* in) { * \brief canonical Printer */ void gdcmDocEntry::Print(std::ostream & os) { + +// TODO : (no more chained list ...) + +/* size_t o; unsigned short int g, e; char st[20]; @@ -126,6 +130,8 @@ void gdcmDocEntry::Print(std::ostream & os) { } s << std::endl; os << s.str(); + + */ } //----------------------------------------------------------------------------- @@ -153,13 +159,13 @@ guint32 gdcmDocEntry::GetFullLength(void) { * \brief Copies all the attributes from an other DocEntry */ -void Copy (gdcmDocEntry* e) { - this->entry = e->entry; +void gdcmDocEntry::Copy (gdcmDocEntry* e) { + this->entry = e->entry; this->UsableLength = e->UsableLength; - this->ReadLength = e->ReadLength; - this->ImplicitVR = e->ImplicitVR; - this->Offset = e->Offset; - this->printLevel = e->printLevel; + this->ReadLength = e->ReadLength; + this->ImplicitVR = e->ImplicitVR; + this->Offset = e->Offset; + this->printLevel = e->printLevel; this->SQDepthLevel = e->SQDepthLevel; } diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index 18decf01..5f1094ba 100644 --- a/src/gdcmDocEntry.h +++ b/src/gdcmDocEntry.h @@ -37,15 +37,6 @@ public: /// Dictionnary, of the current Dicom Header Entry inline std::string GetVR(void) { return entry->GetVR(); }; - /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a - /// 'string', if it's stored as an integer in the Dicom Header of the - /// current Dicom Header Entry - inline std::string GetValue(void) { return value; }; - - /// \brief Returns the area value of the current Dicom Header Entry - /// when it's not string-translatable (e.g : a LUT table) - inline void * GetVoidArea(void) { return voidArea; }; - /// \brief Returns offset (since the beginning of the file, including /// the File Pramble, if any) of the value of the current Dicom HeaderEntry /// \warning offset of the *value*, not of the Dicom Header Entry @@ -78,12 +69,6 @@ public: /// \brief Sets only 'Usable Length' (*not* 'Read Length') of the current /// Dicom Header Entry inline void SetUsableLength(guint32 l) { UsableLength = l; }; - - /// Sets the value (string) of the current Dicom Header Entry - inline void SetValue(std::string val) { value = val; }; - - /// Sets the value (non string) of the current Dicom Header Entry - inline void SetVoidArea(void * area) { voidArea = area; }; /// \brief Sets the offset of the Dicom Element /// \warning use with caution ! diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index e0266a54..c2d28100 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -2,9 +2,6 @@ //----------------------------------------------------------------------------- // #include "gdcmDocEntrySet.h" -#include "gdcmTS.h" -#include "gdcmGlobal.h" -#include "gdcmUtil.h" #include // for std::ios::left, ... diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 78375a3c..30f4f2e7 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -5,17 +5,21 @@ //----------------------------------------------------------------------------- -class GDCM_EXPORT gdcmDocEntrySet -{ +class GDCM_EXPORT gdcmDocEntrySet { + public: -void gdcmElementSet::FindDocEntryLength (gdcmDocEntry *Entry); + + gdcmDocEntrySet(void); + ~gdcmDocEntrySet(void); + + void gdcmElementSet::FindDocEntryLength (gdcmDocEntry *Entry); protected: private: -bool gdcmDocEntrySet::LoadDocEntriesSet(bool exception_on_error = false) + bool gdcmDocEntrySet::LoadDocEntriesSet(bool exception_on_error = false) throw(gdcmFormatError); }; diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h index b40401fa..132fe262 100644 --- a/src/gdcmValEntry.h +++ b/src/gdcmValEntry.h @@ -6,6 +6,7 @@ #include #include +#include "gdcmDocEntry.h" //----------------------------------------------------------------------------- /** * \ingroup gdcmBinEntry @@ -13,10 +14,22 @@ * (when successfuly parsed against a given Dicom dictionary) * This one contains a 'non string' value */ -class GDCM_EXPORT gdcmDocEntry : public gdcmValEntry { +class GDCM_EXPORT gdcmValEntry : public gdcmDocEntry { public: + + gdcmValEntry(void); + ~gdcmValEntry(void); + + /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a + /// 'string', if it's stored as an integer in the Dicom Header of the + /// current Dicom Header Entry + inline std::string GetValue(void) { return value; }; + + /// Sets the value (string) of the current Dicom Header Entry + inline void SetValue(std::string val) { value = val; }; + protected: private: @@ -33,7 +46,7 @@ private: - +}; //----------------------------------------------------------------------------- #endif -- 2.48.1