Program: gdcm
Module: $RCSfile: gdcmDicomDirPatient.cxx,v $
Language: C++
- Date: $Date: 2004/10/22 03:05:41 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2005/01/18 07:53:42 $
+ Version: $Revision: 1.26 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#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 (DicomDirObject needs it
- * to build the HeaderEntries)
- */
-DicomDirPatient::DicomDirPatient(SQItem *s, TagDocEntryHT *ptagHT):
- DicomDirObject(ptagHT)
-{
- docEntries = s->GetDocEntries();
-}
-/**
- * \brief Constructor
- * @param ptagHT pointer to the HTable (DicomDirObject needs it
- * to build the HeaderEntries)
*/
-DicomDirPatient::DicomDirPatient(TagDocEntryHT* ptagHT):
- DicomDirObject(ptagHT)
+DicomDirPatient::DicomDirPatient():
+ DicomDirObject()
{
}
/**
*/
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 DicomDirPatient::Print(std::ostream& os)
+void DicomDirPatient::Print(std::ostream &os, std::string const & )
{
os << "PATIENT" << std::endl;
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 DicomDirPatient::Write(std::ofstream* fp, FileType t)
+void DicomDirPatient::WriteContent(std::ofstream *fp, FileType t)
{
- DicomDirObject::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 );
}
}
//-----------------------------------------------------------------------------
*/
DicomDirStudy* DicomDirPatient::NewStudy()
{
- std::list<Element> elemList =
+ ListDicomDirStudyElem const &elemList =
Global::GetDicomDirElements()->GetDicomDirStudyElements();
- DicomDirStudy* st = new DicomDirStudy( PtagHT );
+ DicomDirStudy *st = new DicomDirStudy();
st->FillObject(elemList);
- studies.push_front(st);
+ Studies.push_front(st);
return st;
}
+/**
+ * \brief Get the first entry while visiting the DicomDirStudy
+ * \return The first DicomDirStudy if found, otherwhise NULL
+ */
+DicomDirStudy *DicomDirPatient::GetFirstEntry()
+{
+ ItDicomDirStudy = Studies.begin();
+ return *ItDicomDirStudy;
+}
+
+/**
+ * \brief Get the next entry while visiting the DicomDirStudies
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return The next DicomDirStudies if found, otherwhise NULL
+ */
+DicomDirStudy *DicomDirPatient::GetNextEntry()
+{
+ if (ItDicomDirStudy != Studies.end())
+ {
+ DicomDirStudy *tmp = *ItDicomDirStudy;
+ ++ItDicomDirStudy;
+ return tmp;
+ }
+ else
+ {
+ return NULL;
+ }
+}
//-----------------------------------------------------------------------------
// Protected