Program: gdcm
Module: $RCSfile: gdcmDicomDirPatient.cxx,v $
Language: C++
- Date: $Date: 2004/09/23 10:47:10 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2005/01/06 20:03:27 $
+ Version: $Revision: 1.23 $
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
#include "gdcmDicomDirPatient.h"
#include "gdcmDicomDirElement.h"
#include "gdcmGlobal.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmSQItem.h"
+
+namespace gdcm
+{
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
* \brief Constructor
- * @param s SQ Item holding the elements related to this "PATIENT" part
- * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it
- * to build the gdcmHeaderEntries)
- */
-gdcmDicomDirPatient::gdcmDicomDirPatient(gdcmSQItem *s, TagDocEntryHT *ptagHT):
- gdcmDicomDirObject(ptagHT)
-{
- docEntries = s->GetDocEntries();
-}
-/**
- * \brief Constructor
- * @param ptagHT pointer to the HTable (gdcmDicomDirObject needs it
- * to build the gdcmHeaderEntries)
*/
-gdcmDicomDirPatient::gdcmDicomDirPatient(TagDocEntryHT *ptagHT):
- gdcmDicomDirObject(ptagHT)
+DicomDirPatient::DicomDirPatient():
+ DicomDirObject()
{
}
/**
* \brief Canonical destructor.
*/
-gdcmDicomDirPatient::~gdcmDicomDirPatient()
+DicomDirPatient::~DicomDirPatient()
{
- for(ListDicomDirStudy::iterator cc = studies.begin();
- cc != studies.end(); ++cc)
+ for(ListDicomDirStudy::const_iterator cc = Studies.begin();
+ cc != Studies.end();
+ ++cc )
{
delete *cc;
}
// Print
/**
* \brief Prints the Object
- * @return
+ * @param os ostream to write to
*/
-void gdcmDicomDirPatient::Print(std::ostream &os)
+void DicomDirPatient::Print(std::ostream &os)
{
os << "PATIENT" << std::endl;
- gdcmDicomDirObject::Print(os);
+ DicomDirObject::Print(os);
- for(ListDicomDirStudy::iterator cc = studies.begin();
- cc != studies.end(); ++cc)
+ for(ListDicomDirStudy::const_iterator cc = Studies.begin();
+ cc != Studies.end();
+ ++cc )
{
(*cc)->SetPrintLevel(PrintLevel);
(*cc)->Print(os);
/**
* \brief Writes the Object
- * @return
+ * @param fp ofstream to write to
+ * @param t Type of the File (explicit VR, implicitVR, ...)
*/
-void gdcmDicomDirPatient::Write(FILE *fp, FileType t)
+void DicomDirPatient::WriteContent(std::ofstream *fp, FileType t)
{
- gdcmDicomDirObject::Write(fp, t);
+ DicomDirObject::WriteContent(fp, t);
- for(ListDicomDirStudy::iterator cc = studies.begin();cc!=studies.end();++cc)
+ for(ListDicomDirStudy::iterator cc = Studies.begin();
+ cc!= Studies.end();
+ ++cc )
{
- (*cc)->Write( fp, t );
+ (*cc)->WriteContent( fp, t );
}
}
//-----------------------------------------------------------------------------
* \brief adds a new Patient at the begining of the PatientList
* of a partially created DICOMDIR
*/
-gdcmDicomDirStudy * gdcmDicomDirPatient::NewStudy()
+DicomDirStudy* DicomDirPatient::NewStudy()
{
- std::list<gdcmElement> elemList =
- gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements();
+ ListDicomDirStudyElem const &elemList =
+ Global::GetDicomDirElements()->GetDicomDirStudyElements();
- gdcmDicomDirStudy *st = new gdcmDicomDirStudy( PtagHT );
+ DicomDirStudy *st = new DicomDirStudy();
st->FillObject(elemList);
- studies.push_front(st);
+ Studies.push_front(st);
return st;
}
// Private
//-----------------------------------------------------------------------------
+
+} // end namespace gdcm