X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirPatient.cxx;h=d918485cd53baf31e72854bc0b8844cbc9d28558;hb=8ac4df8c7543a827c7b89fc9bbcf86625f3c1afe;hp=625adecb4a40c80cd5865951f492da12852d7cd3;hpb=3fd520b58c8d1939994de2c63cc038c3e7ac9522;p=gdcm.git diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx index 625adecb..d918485c 100644 --- a/src/gdcmDicomDirPatient.cxx +++ b/src/gdcmDicomDirPatient.cxx @@ -3,12 +3,12 @@ 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/27 08:39:06 $ + 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 - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -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) +gdcmDicomDirPatient::gdcmDicomDirPatient(TagDocEntryHT* ptagHT): + gdcmDicomDirObject(ptagHT) { } /** @@ -60,10 +60,10 @@ gdcmDicomDirPatient::~gdcmDicomDirPatient() * \brief Prints the Object * @return */ -void gdcmDicomDirPatient::Print(std::ostream &os) +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) @@ -77,9 +77,9 @@ void gdcmDicomDirPatient::Print(std::ostream &os) * \brief Writes the Object * @return */ -void gdcmDicomDirPatient::Write(FILE *fp, FileType t) +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) { @@ -93,12 +93,12 @@ void gdcmDicomDirPatient::Write(FILE *fp, FileType t) * \brief adds a new Patient at the begining of the PatientList * of a partially created DICOMDIR */ -gdcmDicomDirStudy * gdcmDicomDirPatient::NewStudy() +gdcmDicomDirStudy* gdcmDicomDirPatient::NewStudy() { std::list elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements(); - gdcmDicomDirStudy *st = new gdcmDicomDirStudy( PtagHT ); + gdcmDicomDirStudy* st = new gdcmDicomDirStudy( PtagHT ); st->FillObject(elemList); studies.push_front(st);