Program: gdcm
Module: $RCSfile: gdcmDicomDirPatient.cxx,v $
Language: C++
- Date: $Date: 2005/01/18 14:28:32 $
- Version: $Revision: 1.28 $
+ Date: $Date: 2005/01/20 16:16:42 $
+ Version: $Revision: 1.30 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/**
* \brief Constructor
*/
-DicomDirPatient::DicomDirPatient():
+DicomDirPatient::DicomDirPatient(bool empty):
DicomDirObject()
{
+ if( !empty )
+ {
+ ListDicomDirStudyElem const &elemList =
+ Global::GetDicomDirElements()->GetDicomDirPatientElements();
+ FillObject(elemList);
+ }
}
+
/**
* \brief Canonical destructor.
*/
}
}
+//-----------------------------------------------------------------------------
+// Public
/**
* \brief Writes the Object
* @param fp ofstream to write to
(*cc)->WriteContent( fp, t );
}
}
-//-----------------------------------------------------------------------------
-// Public
/**
* \brief adds a new Patient at the begining of the PatientList
*/
DicomDirStudy* DicomDirPatient::NewStudy()
{
- ListDicomDirStudyElem const &elemList =
- Global::GetDicomDirElements()->GetDicomDirStudyElements();
-
DicomDirStudy *st = new DicomDirStudy();
- st->FillObject(elemList);
-
- Studies.push_front(st);
+ Studies.push_back(st);
return st;
}
* \brief Get the first entry while visiting the DicomDirStudy
* \return The first DicomDirStudy if found, otherwhise NULL
*/
-DicomDirStudy *DicomDirPatient::GetFirstEntry()
+DicomDirStudy *DicomDirPatient::GetFirstStudy()
{
- ItDicomDirStudy = Studies.begin();
- if (ItDicomDirStudy != Studies.end())
- return *ItDicomDirStudy;
+ ItStudy = Studies.begin();
+ if (ItStudy != Studies.end())
+ return *ItStudy;
return NULL;
}
* \note : meaningfull only if GetFirstEntry already called
* \return The next DicomDirStudies if found, otherwhise NULL
*/
-DicomDirStudy *DicomDirPatient::GetNextEntry()
+DicomDirStudy *DicomDirPatient::GetNextStudy()
+{
+ gdcmAssertMacro (ItStudy != Studies.end())
+ {
+ ++ItStudy;
+ if (ItStudy != Studies.end())
+ return *ItStudy;
+ }
+ return NULL;
+}
+
+/**
+ * \brief Get the first entry while visiting the DicomDirStudy
+ * \return The first DicomDirStudy if found, otherwhise NULL
+ */
+DicomDirStudy *DicomDirPatient::GetLastStudy()
{
- gdcmAssertMacro (ItDicomDirStudy != Studies.end())
+ ItStudy = Studies.end();
+ if (ItStudy != Studies.begin())
{
- ++ItDicomDirStudy;
- if (ItDicomDirStudy != Studies.end())
- return *ItDicomDirStudy;
+ --ItStudy;
+ return *ItStudy;
}
return NULL;
}
+
//-----------------------------------------------------------------------------
// Protected
// Private
//-----------------------------------------------------------------------------
-
} // end namespace gdcm