From e49dda75179644e228e33af72931535878799dff Mon Sep 17 00:00:00 2001 From: jpr Date: Wed, 5 May 2004 10:57:17 +0000 Subject: [PATCH] forget this one --- src/gdcmBinEntry.cxx | 4 ++-- src/gdcmBinEntry.h | 10 +--------- src/gdcmDocEntrySet.cxx | 19 +++++++++---------- src/gdcmDocEntrySet.h | 13 ++++++++----- src/gdcmDocument.cxx | 3 +++ src/gdcmSQItem.h | 14 +++++++++----- src/gdcmSeqEntry.h | 5 +++++ src/gdcmValEntry.h | 1 - 8 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index 6332c431..d7857acb 100644 --- a/src/gdcmBinEntry.cxx +++ b/src/gdcmBinEntry.cxx @@ -18,7 +18,7 @@ gdcmBinEntry::gdcmBinEntry() : gdcmValEntry() { * \brief Canonical destructor. */ gdcmBinEntry::~gdcmBinEntry(){ - + free (voidArea); } @@ -38,5 +38,5 @@ gdcmBinEntry::~gdcmBinEntry(){ //----------------------------------------------------------------------------- // Private - + //----------------------------------------------------------------------------- diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h index e8beab61..c3254ad6 100644 --- a/src/gdcmBinEntry.h +++ b/src/gdcmBinEntry.h @@ -27,7 +27,7 @@ public: /// 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 + /// \brief Sets the value (non string) of the current Dicom Header Entry inline void SetVoidArea(void * area) { voidArea = area; }; protected: @@ -35,19 +35,11 @@ protected: private: // Variables - /// \brief unsecure memory area to hold 'non string' values /// (ie : Lookup Tables, overlays, icons) void *voidArea; - - - - - - - }; //----------------------------------------------------------------------------- diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index c2d28100..d60f1dbe 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -2,9 +2,7 @@ //----------------------------------------------------------------------------- // #include "gdcmDocEntrySet.h" - -#include // for std::ios::left, ... - +#include "gdcmException.h" //----------------------------------------------------------------------------- // Constructor / Destructor @@ -13,9 +11,12 @@ * \brief Constructor from a given gdcmDocEntrySet */ gdcmDocEntrySet::gdcmDocEntrySet() { - } - +/** + * \brief Canonical destructor. + */ +gdcmDocEntrySet::~gdcmDocEntrySet(){ +} //----------------------------------------------------------------------------- // Print /* @@ -37,13 +38,11 @@ gdcmDocEntrySet::gdcmDocEntrySet() { /** * \brief Parses an EntrySet (Document header or SQ Item ) * \ and load element values (a voir !) - * @return false if file is not ACR-NEMA / PAPYRUS / DICOM + * @return false anything wrong happens */ -bool gdcmDocument::LoadDocEntrySet(bool exception_on_error) throw(gdcmFormatError) { +bool gdcmDocEntrySet::LoadDocEntrySet(bool exception_on_error) + throw(gdcmFormatError) { (void)exception_on_error; - rewind(fp); - if (!CheckSwap()) - return false; gdcmDocEntry *newDocEntry = (gdcmDocEntry *)0; gdcmValEntry *newValEntry = (gdcmValEntry *)0; diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h index 30f4f2e7..7ecee4e8 100644 --- a/src/gdcmDocEntrySet.h +++ b/src/gdcmDocEntrySet.h @@ -1,25 +1,28 @@ // gdcmDocEntrySet.h - +//----------------------------------------------------------------------------- #ifndef GDCMDOCENTRYSET_H #define GDCMDOCENTRYSET_H +#include "gdcmException.h" +#include "gdcmDocEntry.h" + //----------------------------------------------------------------------------- -class GDCM_EXPORT gdcmDocEntrySet { +class GDCM_EXPORT gdcmDocEntrySet +{ public: - gdcmDocEntrySet(void); ~gdcmDocEntrySet(void); - void gdcmElementSet::FindDocEntryLength (gdcmDocEntry *Entry); + void FindDocEntryLength (gdcmDocEntry *Entry); protected: private: - bool gdcmDocEntrySet::LoadDocEntriesSet(bool exception_on_error = false) + bool LoadDocEntrySet(bool exception_on_error = false) throw(gdcmFormatError); }; diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 4af6b8f0..7f87beac 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -68,6 +68,9 @@ gdcmDocument::gdcmDocument(const char *inFilename, if ( !OpenFile(exception_on_error)) return; + rewind(fp); + if (!CheckSwap()) + return NULL; // Du menage à faire avant de sortir ? LoadDocEntries(); CloseFile(); diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h index 8ef543f3..675492d5 100644 --- a/src/gdcmSQItem.h +++ b/src/gdcmSQItem.h @@ -1,13 +1,17 @@ // gdcmSQItem.h - +//----------------------------------------------------------------------------- #ifndef GDCMSQITEM_H #define GDCMSQITEM_H +#include + +#include "gdcmDocEntry.h" +#include "gdcmDocEntrySet.h" + //----------------------------------------------------------------------------- typedef std::list ListDocEntry; //----------------------------------------------------------------------------- - -class GDCM_EXPORT gdcmSQItem : public gdcmDocEntrySet +class GDCM_EXPORT gdcmSQItem : public gdcmDocEntrySet { public: gdcmSQItem(void); @@ -20,7 +24,7 @@ public: {return docEntries;}; /// \brief adds the passed DocEntry to the DocEntry chained List for this SQ Item. - inline void AddDocEntry(DocEntry *e) + inline void AddDocEntry(gdcmDocEntry *e) {docEntries.push_back(e);}; protected: @@ -31,7 +35,7 @@ private: // Variables /// \brief chained list of (Elementary) Doc Entries - ListDocEntry docEntries; + ListDocEntry docEntries; }; diff --git a/src/gdcmSeqEntry.h b/src/gdcmSeqEntry.h index 7a818ef0..2c02597a 100644 --- a/src/gdcmSeqEntry.h +++ b/src/gdcmSeqEntry.h @@ -3,6 +3,11 @@ #ifndef GDCMSQDOCENTRY_H #define GDCMSQDOCENTRY_H +#include + +#include "gdcmSQItem.h" +#include "gdcmDocEntry.h" + //----------------------------------------------------------------------------- typedef std::list ListSQItem; //----------------------------------------------------------------------------- diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h index 132fe262..c87f9e85 100644 --- a/src/gdcmValEntry.h +++ b/src/gdcmValEntry.h @@ -18,7 +18,6 @@ class GDCM_EXPORT gdcmValEntry : public gdcmDocEntry { public: - gdcmValEntry(void); ~gdcmValEntry(void); -- 2.45.1