Program: gdcm
Module: $RCSfile: gdcmDicomDirStudy.cxx,v $
Language: C++
- Date: $Date: 2005/01/25 11:11:58 $
- Version: $Revision: 1.31 $
+ Date: $Date: 2005/07/11 08:20:25 $
+ Version: $Revision: 1.40 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirElement.h"
#include "gdcmGlobal.h"
#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirVisit.h"
#include "gdcmDebug.h"
namespace gdcm
// Constructor / Destructor
/**
* \brief Constructor
+ * \note End user must use : DicomDirPatient::NewStudy()
*/
-DicomDirStudy::DicomDirStudy(bool empty):
- DicomDirObject()
+DicomDirStudy::DicomDirStudy(bool empty)
+ :DicomDirObject()
{
- if( !empty )
+ if ( !empty )
{
ListDicomDirStudyElem const &elemList =
Global::GetDicomDirElements()->GetDicomDirStudyElements();
ClearSerie();
}
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief Prints the Object
- * @param os ostream to write to
- * @param indent Indentation string to be prepended during printing
- * @return
- */
-void DicomDirStudy::Print(std::ostream &os, std::string const & )
-{
- os << "STUDY" << std::endl;
- DicomDirObject::Print(os);
-
- for(ListDicomDirSerie::iterator cc = Series.begin();
- cc != Series.end();
- ++cc)
- {
- (*cc)->SetPrintLevel(PrintLevel);
- (*cc)->Print(os);
- }
-}
-
//-----------------------------------------------------------------------------
// Public
/**
{
(*cc)->WriteContent( fp, t );
}
+
+ for(ListDicomDirVisit::iterator icc = Visits.begin();
+ icc!= Visits.end();
+ ++icc )
+ {
+ (*icc)->WriteContent( fp, t );
+ }
}
/**
- * \brief adds a new Serie at the begining of the SerieList
+ * \brief adds a new Serie at the beginning of the SerieList
* of a partially created DICOMDIR
*/
DicomDirSerie *DicomDirStudy::NewSerie()
{
- DicomDirSerie* st = new DicomDirSerie();
+ DicomDirSerie *st = new DicomDirSerie();
Series.push_back(st);
return st;
}
DicomDirSerie *DicomDirStudy::GetNextSerie()
{
gdcmAssertMacro (ItSerie != Series.end());
- {
- ++ItSerie;
- if (ItSerie != Series.end())
- return *ItSerie;
- }
+
+ ++ItSerie;
+ if (ItSerie != Series.end())
+ return *ItSerie;
return NULL;
}
/**
* \brief Get the last entry while visiting the DicomDirSeries
- * \return The first DicomDirSerie if found, otherwhise NULL
+ * \return The last DicomDirSerie if found, otherwhise NULL
*/
DicomDirSerie *DicomDirStudy::GetLastSerie()
{
return NULL;
}
+
+/**
+ * \brief adds a new Visit at the beginning of the VisitList
+ * of a partially created DICOMDIR
+ */
+DicomDirVisit *DicomDirStudy::NewVisit()
+{
+ DicomDirVisit *st = new DicomDirVisit();
+ Visits.push_back(st);
+ return st;
+}
+
+/**
+ * \brief Remove all visits in the study
+ */
+void DicomDirStudy::ClearVisit()
+{
+ for(ListDicomDirVisit::iterator cc = Visits.begin();
+ cc != Visits.end();
+ ++cc )
+ {
+ delete *cc;
+ }
+ Visits.clear();
+}
+
+/**
+ * \brief Get the first entry while visiting the DicomDirVisit
+ * \return The first DicomDirVisit if found, otherwhise NULL
+ */
+DicomDirVisit *DicomDirStudy::GetFirstVisit()
+{
+ ItVisit = Visits.begin();
+ if (ItVisit != Visits.end())
+ return *ItVisit;
+ return NULL;
+}
+
+/**
+ * \brief Get the next entry while visiting the DicomDirVisit
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return The next DicomDirVisit if found, otherwhise NULL
+ */
+DicomDirVisit *DicomDirStudy::GetNextVisit()
+{
+ gdcmAssertMacro (ItVisit != Visits.end());
+
+ ++ItVisit;
+ if (ItVisit != Visits.end())
+ return *ItVisit;
+ return NULL;
+}
+
+/**
+ * \brief Get the last entry while visiting the DicomDirVisit
+ * \return The last DicomDirVisit if found, otherwhise NULL
+ */
+DicomDirVisit *DicomDirStudy::GetLastVisit()
+{
+ ItVisit = Visits.end();
+ if (ItVisit != Visits.begin())
+ {
+ --ItVisit;
+ return *ItVisit;
+ }
+ return NULL;
+}
+
//-----------------------------------------------------------------------------
// Protected
// Private
//-----------------------------------------------------------------------------
-} // end namespace gdcm
+// Print
+/**
+ * \brief Prints the Object
+ * @param os ostream to write to
+ * @param indent Indentation string to be prepended during printing
+ * @return
+ */
+void DicomDirStudy::Print(std::ostream &os, std::string const & )
+{
+ os << "STUDY" << std::endl;
+ DicomDirObject::Print(os);
+
+ for(ListDicomDirSerie::iterator cc = Series.begin();
+ cc != Series.end();
+ ++cc)
+ {
+ (*cc)->SetPrintLevel(PrintLevel);
+ (*cc)->Print(os);
+ }
+
+ for(ListDicomDirVisit::iterator cc2 = Visits.begin();
+ cc2 != Visits.end();
+ ++cc2)
+ {
+ (*cc2)->SetPrintLevel(PrintLevel);
+ (*cc2)->Print(os);
+ }
+
+}
+//-----------------------------------------------------------------------------
+} // end namespace gdcm