From ab0aa4fa11e3ac7ec236d1aceb6f0cf89fe83eae Mon Sep 17 00:00:00 2001 From: jpr Date: Thu, 23 Sep 2004 10:47:09 +0000 Subject: [PATCH] * class gdcmObject is now called gdcmDicomDirObject (less confusing name) --- ChangeLog | 1 + src/CMakeLists.txt | 2 +- src/gdcmDicomDir.cxx | 6 ++--- src/gdcmDicomDir.h | 8 +++---- src/gdcmDicomDirImage.cxx | 14 +++++------ src/gdcmDicomDirImage.h | 8 +++---- src/gdcmDicomDirMeta.cxx | 6 ++--- src/gdcmDicomDirMeta.h | 8 +++---- ...{gdcmObject.cxx => gdcmDicomDirObject.cxx} | 24 +++++++++---------- src/{gdcmObject.h => gdcmDicomDirObject.h} | 18 +++++++------- src/gdcmDicomDirPatient.cxx | 16 ++++++------- src/gdcmDicomDirPatient.h | 8 +++---- src/gdcmDicomDirSerie.cxx | 16 ++++++------- src/gdcmDicomDirSerie.h | 8 +++---- src/gdcmDicomDirStudy.cxx | 16 ++++++------- src/gdcmDicomDirStudy.h | 8 +++---- src/gdcmSQItem.h | 6 ++--- 17 files changed, 87 insertions(+), 86 deletions(-) rename src/{gdcmObject.cxx => gdcmDicomDirObject.cxx} (85%) rename src/{gdcmObject.h => gdcmDicomDirObject.h} (83%) diff --git a/ChangeLog b/ChangeLog index fbec1e02..9735dfad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ we can now delete[] it safely * VoidArea is now called BinArea (less confusing name), and all the methods called ...VoidArea... are now ... BinArea... + * class gdcmObject is now called gdcmDicomDirObject (less confusing name) 2004-09-22 Eric Boix * src/gdcmDocument.cxx: gdcmDocument::~gdcmDocument() doesn't clear (nor diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 40a85f93..a57e007f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,7 +44,7 @@ SET(libgdcm_la_SOURCES gdcmDicomDirStudy.cxx gdcmDicomDirSerie.cxx gdcmDicomDirImage.cxx - gdcmObject.cxx + gdcmDicomDirObject.cxx ) ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} ) diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 6b758ed1..e920abfe 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2004/08/31 14:24:47 $ - Version: $Revision: 1.67 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.68 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -526,7 +526,7 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient() * \brief adds to the HTable * the gdcmEntries (Dicom Elements) corresponding to the given type * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE - * @param type gdcmObject type to create (GDCM_DICOMDIR_PATIENT, + * @param type gdcmDicomDirObject type to create (GDCM_DICOMDIR_PATIENT, * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...) * @param header gdcmHeader of the current file */ diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h index ace71379..6e9de933 100644 --- a/src/gdcmDicomDir.h +++ b/src/gdcmDicomDir.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.h,v $ Language: C++ - Date: $Date: 2004/08/31 14:24:47 $ - Version: $Revision: 1.28 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.29 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -87,7 +87,7 @@ public: // Write bool WriteDicomDir(std::string const & fileName); - /// Types of the gdcmObject within the gdcmDicomDir + /// Types of the gdcmDicomDirObject within the gdcmDicomDir typedef enum { GDCM_DICOMDIR_NONE, @@ -121,7 +121,7 @@ private: // Variables - /// Pointer on *the* gdcmObject 'DicomDirMeta Elements' + /// Pointer on *the* gdcmDicomDirObject 'DicomDirMeta Elements' gdcmDicomDirMeta *metaElems; /// Chained list of DicomDirPatient (to be exploited recursively) diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx index ea24f053..f14f92bc 100644 --- a/src/gdcmDicomDirImage.cxx +++ b/src/gdcmDicomDirImage.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirImage.cxx,v $ Language: C++ - Date: $Date: 2004/08/31 15:39:48 $ - Version: $Revision: 1.9 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,11 +25,11 @@ * \ingroup gdcmDicomDirImage * \brief Constructor * @param s SQ Item holding the elements - * @param ptagHT pointer to the HTable (gdcmObject needs it + * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it * to build the gdcmDocEntries) */ gdcmDicomDirImage::gdcmDicomDirImage(gdcmSQItem *s, TagDocEntryHT *ptagHT): - gdcmObject(ptagHT) + gdcmDicomDirObject(ptagHT) { docEntries = s->GetDocEntries(); } @@ -37,11 +37,11 @@ gdcmDicomDirImage::gdcmDicomDirImage(gdcmSQItem *s, TagDocEntryHT *ptagHT): /** * \ingroup gdcmDicomDirImage * \brief Constructor - * @param ptagHT pointer to the HTable (gdcmObject needs it + * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it * to build the gdcmDocEntries) */ gdcmDicomDirImage::gdcmDicomDirImage(TagDocEntryHT *ptagHT): - gdcmObject(ptagHT) + gdcmDicomDirObject(ptagHT) { } /** @@ -71,7 +71,7 @@ void gdcmDicomDirImage::Print(std::ostream &os) } os << std::endl; - gdcmObject::Print(os); + gdcmDicomDirObject::Print(os); } //----------------------------------------------------------------------------- diff --git a/src/gdcmDicomDirImage.h b/src/gdcmDicomDirImage.h index dac05c64..b912c3ad 100644 --- a/src/gdcmDicomDirImage.h +++ b/src/gdcmDicomDirImage.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirImage.h,v $ Language: C++ - Date: $Date: 2004/08/26 15:29:52 $ - Version: $Revision: 1.7 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.8 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,10 +19,10 @@ #ifndef GDCMDICOMIMAGE_H #define GDCMDICOMIMAGE_H -#include "gdcmObject.h" +#include "gdcmDicomDirObject.h" //----------------------------------------------------------------------------- -class GDCM_EXPORT gdcmDicomDirImage : public gdcmObject +class GDCM_EXPORT gdcmDicomDirImage : public gdcmDicomDirObject { public: gdcmDicomDirImage(gdcmSQItem *s, TagDocEntryHT *ptagHT); diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx index e7202b02..116acf30 100644 --- a/src/gdcmDicomDirMeta.cxx +++ b/src/gdcmDicomDirMeta.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirMeta.cxx,v $ Language: C++ - Date: $Date: 2004/08/30 16:15:40 $ - Version: $Revision: 1.8 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,7 +27,7 @@ * \brief Constructor */ gdcmDicomDirMeta::gdcmDicomDirMeta(TagDocEntryHT *ptagHT): - gdcmObject(ptagHT) + gdcmDicomDirObject(ptagHT) { } diff --git a/src/gdcmDicomDirMeta.h b/src/gdcmDicomDirMeta.h index 7f8bd579..c85114d4 100644 --- a/src/gdcmDicomDirMeta.h +++ b/src/gdcmDicomDirMeta.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirMeta.h,v $ Language: C++ - Date: $Date: 2004/08/26 15:29:52 $ - Version: $Revision: 1.6 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,10 +19,10 @@ #ifndef GDCMDICOMDIRMETA_H #define GDCMDICOMDIRMETA_H -#include "gdcmObject.h" +#include "gdcmDicomDirObject.h" //----------------------------------------------------------------------------- -class GDCM_EXPORT gdcmDicomDirMeta : public gdcmObject +class GDCM_EXPORT gdcmDicomDirMeta : public gdcmDicomDirObject { public: gdcmDicomDirMeta(TagDocEntryHT *ptagHT); diff --git a/src/gdcmObject.cxx b/src/gdcmDicomDirObject.cxx similarity index 85% rename from src/gdcmObject.cxx rename to src/gdcmDicomDirObject.cxx index d5f2848f..9094a45d 100644 --- a/src/gdcmObject.cxx +++ b/src/gdcmDicomDirObject.cxx @@ -1,10 +1,10 @@ /*========================================================================= Program: gdcm - Module: $RCSfile: gdcmObject.cxx,v $ + Module: $RCSfile: gdcmDicomDirObject.cxx,v $ Language: C++ - Date: $Date: 2004/08/01 00:59:21 $ - Version: $Revision: 1.24 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.1 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,22 +16,22 @@ =========================================================================*/ -#include "gdcmObject.h" +#include "gdcmDicomDirObject.h" #include "gdcmGlobal.h" #include "gdcmDebug.h" #include "gdcmValEntry.h" //----------------------------------------------------------------------------- /** - * \ingroup gdcmObject + * \ingroup gdcmDicomDirObject * \brief Constructor * - * @param ptagHT pointer to the HTable (gdcmObject needs it + * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it * to build the gdcmDocEntries) * @param depth Sequence depth level */ -gdcmObject::gdcmObject(TagDocEntryHT *ptagHT, int depth) +gdcmDicomDirObject::gdcmDicomDirObject(TagDocEntryHT *ptagHT, int depth) : gdcmSQItem (depth) { PtagHT = ptagHT; @@ -39,10 +39,10 @@ gdcmObject::gdcmObject(TagDocEntryHT *ptagHT, int depth) /** - * \ingroup gdcmObject + * \ingroup gdcmDicomDirObject * \brief Canonical destructor. */ -gdcmObject::~gdcmObject() +gdcmDicomDirObject::~gdcmDicomDirObject() { } @@ -53,13 +53,13 @@ gdcmObject::~gdcmObject() /** - * \ingroup gdcmObject + * \ingroup gdcmDicomDirObject * \brief Builds a hash table (multimap) containing * pointers to all Header Entries (i.e Dicom Element) * related to this 'object' * @return */ -TagDocEntryHT gdcmObject::GetEntry() +TagDocEntryHT gdcmDicomDirObject::GetEntry() { TagDocEntryHT HT; docEntries=GetDocEntries(); @@ -77,7 +77,7 @@ TagDocEntryHT gdcmObject::GetEntry() * \brief add the 'Object' related Dicom Elements to the listEntries * of a partially created DICOMDIR */ -void gdcmObject::FillObject(std::list elemList) +void gdcmDicomDirObject::FillObject(std::list elemList) { // FillObject rempli le SQItem qui sera accroche au bon endroit diff --git a/src/gdcmObject.h b/src/gdcmDicomDirObject.h similarity index 83% rename from src/gdcmObject.h rename to src/gdcmDicomDirObject.h index 04363a85..8997df87 100644 --- a/src/gdcmObject.h +++ b/src/gdcmDicomDirObject.h @@ -1,10 +1,10 @@ /*========================================================================= Program: gdcm - Module: $RCSfile: gdcmObject.h,v $ + Module: $RCSfile: gdcmDicomDirObject.h,v $ Language: C++ - Date: $Date: 2004/08/26 15:29:53 $ - Version: $Revision: 1.19 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.1 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,20 +28,20 @@ #include "gdcmSQItem.h" //----------------------------------------------------------------------------- -class gdcmObject; -typedef std::list ListContent; +class gdcmDicomDirObject; +typedef std::list ListContent; //----------------------------------------------------------------------------- /** - * \ingroup gdcmObject + * \ingroup gdcmDicomDirObject * \brief Base object */ -class GDCM_EXPORT gdcmObject : public gdcmSQItem +class GDCM_EXPORT gdcmDicomDirObject : public gdcmSQItem { public: - gdcmObject(TagDocEntryHT *ptagHT, int depth = 0); - virtual ~gdcmObject(); + gdcmDicomDirObject(TagDocEntryHT *ptagHT, int depth = 0); + virtual ~gdcmDicomDirObject(); /** * \brief Sets the print level for the Dicom Header * \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx index 625adecb..08df0cd5 100644 --- a/src/gdcmDicomDirPatient.cxx +++ b/src/gdcmDicomDirPatient.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirPatient.cxx,v $ Language: C++ - Date: $Date: 2004/08/26 15:29:52 $ - Version: $Revision: 1.11 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,21 +25,21 @@ /** * \brief Constructor * @param s SQ Item holding the elements related to this "PATIENT" part - * @param ptagHT pointer to the HTable (gdcmObject needs it + * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it * to build the gdcmHeaderEntries) */ gdcmDicomDirPatient::gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT): - gdcmObject(ptagHT) + gdcmDicomDirObject(ptagHT) { docEntries = s->GetDocEntries(); } /** * \brief Constructor - * @param ptagHT pointer to the HTable (gdcmObject needs it + * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it * to build the gdcmHeaderEntries) */ gdcmDicomDirPatient::gdcmDicomDirPatient(TagDocEntryHT *ptagHT): - gdcmObject(ptagHT) + gdcmDicomDirObject(ptagHT) { } /** @@ -63,7 +63,7 @@ gdcmDicomDirPatient::~gdcmDicomDirPatient() void gdcmDicomDirPatient::Print(std::ostream &os) { os << "PATIENT" << std::endl; - gdcmObject::Print(os); + gdcmDicomDirObject::Print(os); for(ListDicomDirStudy::iterator cc = studies.begin(); cc != studies.end(); ++cc) @@ -79,7 +79,7 @@ void gdcmDicomDirPatient::Print(std::ostream &os) */ void gdcmDicomDirPatient::Write(FILE *fp, FileType t) { - gdcmObject::Write(fp, t); + gdcmDicomDirObject::Write(fp, t); for(ListDicomDirStudy::iterator cc = studies.begin();cc!=studies.end();++cc) { diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h index eb3e7bde..742e3740 100644 --- a/src/gdcmDicomDirPatient.h +++ b/src/gdcmDicomDirPatient.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirPatient.h,v $ Language: C++ - Date: $Date: 2004/08/26 15:29:52 $ - Version: $Revision: 1.7 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.8 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,14 +19,14 @@ #ifndef GDCMPATIENT_H #define GDCMPATIENT_H -#include "gdcmObject.h" +#include "gdcmDicomDirObject.h" #include "gdcmDicomDirStudy.h" #include "gdcmSQItem.h" //----------------------------------------------------------------------------- typedef std::list ListDicomDirStudy; //----------------------------------------------------------------------------- -class GDCM_EXPORT gdcmDicomDirPatient : public gdcmObject +class GDCM_EXPORT gdcmDicomDirPatient : public gdcmDicomDirObject { public: gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT); diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx index 22f4b4d4..ddeb9a08 100644 --- a/src/gdcmDicomDirSerie.cxx +++ b/src/gdcmDicomDirSerie.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirSerie.cxx,v $ Language: C++ - Date: $Date: 2004/08/26 15:29:52 $ - Version: $Revision: 1.13 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,22 +25,22 @@ /** * \brief Constructor * @param s SQ Item holding the elements related to this "SERIE" part - * @param ptagHT pointer to the HTable (gdcmObject needs it + * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it * to build the gdcmDocEntries) */ gdcmDicomDirSerie::gdcmDicomDirSerie(gdcmSQItem *s, TagDocEntryHT *ptagHT): - gdcmObject(ptagHT) + gdcmDicomDirObject(ptagHT) { docEntries = s->GetDocEntries(); } /** * \brief Constructor - * @param ptagHT pointer to the HTable (gdcmObject needs it + * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it * to build the gdcmDocEntries) */ gdcmDicomDirSerie::gdcmDicomDirSerie(TagDocEntryHT *ptagHT): - gdcmObject(ptagHT) + gdcmDicomDirObject(ptagHT) { } /** @@ -65,7 +65,7 @@ gdcmDicomDirSerie::~gdcmDicomDirSerie() void gdcmDicomDirSerie::Print(std::ostream &os) { os << "SERIE" << std::endl; - gdcmObject::Print(os); + gdcmDicomDirObject::Print(os); for(ListDicomDirImage::iterator cc = images.begin(); cc != images.end(); @@ -85,7 +85,7 @@ void gdcmDicomDirSerie::Print(std::ostream &os) */ void gdcmDicomDirSerie::Write(FILE *fp, FileType t) { - gdcmObject::Write(fp, t); + gdcmDicomDirObject::Write(fp, t); for(ListDicomDirImage::iterator cc = images.begin();cc!=images.end();++cc) { diff --git a/src/gdcmDicomDirSerie.h b/src/gdcmDicomDirSerie.h index ae419146..d6d74001 100644 --- a/src/gdcmDicomDirSerie.h +++ b/src/gdcmDicomDirSerie.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirSerie.h,v $ Language: C++ - Date: $Date: 2004/08/26 15:29:52 $ - Version: $Revision: 1.7 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.8 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,14 +19,14 @@ #ifndef GDCMDICOMDIRSERIE_H #define GDCMDICOMDIRSERIE_H -#include "gdcmObject.h" +#include "gdcmDicomDirObject.h" #include "gdcmDicomDirImage.h" //----------------------------------------------------------------------------- typedef std::list ListDicomDirImage; //----------------------------------------------------------------------------- -class GDCM_EXPORT gdcmDicomDirSerie : public gdcmObject +class GDCM_EXPORT gdcmDicomDirSerie : public gdcmDicomDirObject { public: gdcmDicomDirSerie(gdcmSQItem *s, TagDocEntryHT *ptagHT); diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx index cd3b07c6..0032f182 100644 --- a/src/gdcmDicomDirStudy.cxx +++ b/src/gdcmDicomDirStudy.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirStudy.cxx,v $ Language: C++ - Date: $Date: 2004/08/26 15:29:52 $ - Version: $Revision: 1.10 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -26,22 +26,22 @@ * \ingroup gdcmDicomDirStudy * \brief constructor * @param s SQ Item holding the elements related to this "STUDY" part - * @param ptagHT pointer to the HTable (gdcmObject needs it + * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it * to build the gdcmHeaderEntries) */ gdcmDicomDirStudy::gdcmDicomDirStudy(gdcmSQItem *s, TagDocEntryHT *ptagHT): - gdcmObject(ptagHT) + gdcmDicomDirObject(ptagHT) { docEntries = s->GetDocEntries(); } /** * \ingroup gdcmDicomDirStudy * \brief constructor - * @param ptagHT pointer to the HTable (gdcmObject needs it + * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it * to build the gdcmHeaderEntries) */ gdcmDicomDirStudy::gdcmDicomDirStudy(TagDocEntryHT *ptagHT): - gdcmObject(ptagHT) + gdcmDicomDirObject(ptagHT) { } /** @@ -66,7 +66,7 @@ gdcmDicomDirStudy::~gdcmDicomDirStudy() void gdcmDicomDirStudy::Print(std::ostream &os) { os << "STUDY" << std::endl; - gdcmObject::Print(os); + gdcmDicomDirObject::Print(os); for(ListDicomDirSerie::iterator cc = series.begin(); cc != series.end(); @@ -86,7 +86,7 @@ void gdcmDicomDirStudy::Print(std::ostream &os) */ void gdcmDicomDirStudy::Write(FILE *fp, FileType t) { - gdcmObject::Write(fp, t); + gdcmDicomDirObject::Write(fp, t); for(ListDicomDirSerie::iterator cc = series.begin();cc!=series.end();++cc) { diff --git a/src/gdcmDicomDirStudy.h b/src/gdcmDicomDirStudy.h index 8c3c8d3e..5f37eb2a 100644 --- a/src/gdcmDicomDirStudy.h +++ b/src/gdcmDicomDirStudy.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirStudy.h,v $ Language: C++ - Date: $Date: 2004/08/26 15:29:52 $ - Version: $Revision: 1.7 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.8 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,14 +19,14 @@ #ifndef GDCMDICOMDIRSTUDY_H #define GDCMDICOMDIRSTUDY_H -#include "gdcmObject.h" +#include "gdcmDicomDirObject.h" #include "gdcmDicomDirSerie.h" //----------------------------------------------------------------------------- typedef std::list ListDicomDirSerie; //----------------------------------------------------------------------------- -class GDCM_EXPORT gdcmDicomDirStudy : public gdcmObject +class GDCM_EXPORT gdcmDicomDirStudy : public gdcmDicomDirObject { public: gdcmDicomDirStudy(gdcmSQItem *s, TagDocEntryHT *ptagHT); diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h index 1b3cdad7..08cadfdb 100644 --- a/src/gdcmSQItem.h +++ b/src/gdcmSQItem.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.h,v $ Language: C++ - Date: $Date: 2004/09/16 19:21:57 $ - Version: $Revision: 1.15 $ + Date: $Date: 2004/09/23 10:47:10 $ + Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -85,7 +85,7 @@ protected: int SQItemNumber; ///\brief pointer to the HTable of the gdcmDocument, - /// (because we don't know it within any gdcmObject nor any gdcmSQItem) + /// (because we don't know it within any gdcmDicomDirObject nor any gdcmSQItem) TagDocEntryHT *PtagHT; -- 2.48.1