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 <Eric.Boix@creatis.insa-lyon.fr>
* src/gdcmDocument.cxx: gdcmDocument::~gdcmDocument() doesn't clear (nor
gdcmDicomDirStudy.cxx
gdcmDicomDirSerie.cxx
gdcmDicomDirImage.cxx
- gdcmObject.cxx
+ gdcmDicomDirObject.cxx
)
ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
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
* \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
*/
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
// 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,
// Variables
- /// Pointer on *the* gdcmObject 'DicomDirMeta Elements'
+ /// Pointer on *the* gdcmDicomDirObject 'DicomDirMeta Elements'
gdcmDicomDirMeta *metaElems;
/// Chained list of DicomDirPatient (to be exploited recursively)
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
* \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();
}
/**
* \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)
{
}
/**
}
os << std::endl;
- gdcmObject::Print(os);
+ gdcmDicomDirObject::Print(os);
}
//-----------------------------------------------------------------------------
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
#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);
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
* \brief Constructor
*/
gdcmDicomDirMeta::gdcmDicomDirMeta(TagDocEntryHT *ptagHT):
- gdcmObject(ptagHT)
+ gdcmDicomDirObject(ptagHT)
{
}
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
#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);
/*=========================================================================
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
=========================================================================*/
-#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;
/**
- * \ingroup gdcmObject
+ * \ingroup gdcmDicomDirObject
* \brief Canonical destructor.
*/
-gdcmObject::~gdcmObject()
+gdcmDicomDirObject::~gdcmDicomDirObject()
{
}
/**
- * \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();
* \brief add the 'Object' related Dicom Elements to the listEntries
* of a partially created DICOMDIR
*/
-void gdcmObject::FillObject(std::list<gdcmElement> elemList)
+void gdcmDicomDirObject::FillObject(std::list<gdcmElement> elemList)
{
// FillObject rempli le SQItem qui sera accroche au bon endroit
/*=========================================================================
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
#include "gdcmSQItem.h"
//-----------------------------------------------------------------------------
-class gdcmObject;
-typedef std::list<gdcmObject *> ListContent;
+class gdcmDicomDirObject;
+typedef std::list<gdcmDicomDirObject *> 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
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
/**
* \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)
{
}
/**
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)
*/
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)
{
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
#ifndef GDCMPATIENT_H
#define GDCMPATIENT_H
-#include "gdcmObject.h"
+#include "gdcmDicomDirObject.h"
#include "gdcmDicomDirStudy.h"
#include "gdcmSQItem.h"
//-----------------------------------------------------------------------------
typedef std::list<gdcmDicomDirStudy*> ListDicomDirStudy;
//-----------------------------------------------------------------------------
-class GDCM_EXPORT gdcmDicomDirPatient : public gdcmObject
+class GDCM_EXPORT gdcmDicomDirPatient : public gdcmDicomDirObject
{
public:
gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT);
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
/**
* \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)
{
}
/**
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();
*/
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)
{
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
#ifndef GDCMDICOMDIRSERIE_H
#define GDCMDICOMDIRSERIE_H
-#include "gdcmObject.h"
+#include "gdcmDicomDirObject.h"
#include "gdcmDicomDirImage.h"
//-----------------------------------------------------------------------------
typedef std::list<gdcmDicomDirImage *> ListDicomDirImage;
//-----------------------------------------------------------------------------
-class GDCM_EXPORT gdcmDicomDirSerie : public gdcmObject
+class GDCM_EXPORT gdcmDicomDirSerie : public gdcmDicomDirObject
{
public:
gdcmDicomDirSerie(gdcmSQItem *s, TagDocEntryHT *ptagHT);
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
* \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)
{
}
/**
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();
*/
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)
{
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
#ifndef GDCMDICOMDIRSTUDY_H
#define GDCMDICOMDIRSTUDY_H
-#include "gdcmObject.h"
+#include "gdcmDicomDirObject.h"
#include "gdcmDicomDirSerie.h"
//-----------------------------------------------------------------------------
typedef std::list<gdcmDicomDirSerie *> ListDicomDirSerie;
//-----------------------------------------------------------------------------
-class GDCM_EXPORT gdcmDicomDirStudy : public gdcmObject
+class GDCM_EXPORT gdcmDicomDirStudy : public gdcmDicomDirObject
{
public:
gdcmDicomDirStudy(gdcmSQItem *s, TagDocEntryHT *ptagHT);
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
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;
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff