Program: gdcm
Module: $RCSfile: gdcmDicomDirStudy.cxx,v $
Language: C++
- Date: $Date: 2005/07/08 19:07:12 $
- Version: $Revision: 1.38 $
+ Date: $Date: 2007/08/29 15:30:49 $
+ Version: $Revision: 1.45 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirVisit.h"
#include "gdcmDebug.h"
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
* @param t Type of the File (explicit VR, implicitVR, ...)
* @return
*/
-void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t)
+void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t, bool dummy, bool dummy2)
{
- DicomDirObject::WriteContent(fp, t);
+ DicomDirObject::WriteContent(fp, t, false, true);
for(ListDicomDirSerie::iterator cc = Series.begin();
cc!= Series.end();
++cc )
{
- (*cc)->WriteContent( fp, t );
+ (*cc)->WriteContent( fp, t, false, true );
}
- for(ListDicomDirVisit::iterator cc = Visits.begin();
- cc!= Visits.end();
- ++cc )
+ for(ListDicomDirVisit::iterator icc = Visits.begin();
+ icc!= Visits.end();
+ ++icc )
{
- (*cc)->WriteContent( fp, t );
+ (*icc)->WriteContent( fp, t, false, true );
}
}
*/
DicomDirSerie *DicomDirStudy::NewSerie()
{
- DicomDirSerie *st = new DicomDirSerie();
- Series.push_back(st);
- return st;
-}
-
-/**
- * \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;
+ DicomDirSerie *dd = DicomDirSerie::New();
+ Series.push_back(dd);
+ return dd;
}
/**
cc != Series.end();
++cc )
{
- delete *cc;
+ (*cc)->Delete();
}
Series.clear();
}
-/**
- * \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 DicomDirSeries
* \return The first DicomDirSerie if found, otherwhise NULL
return NULL;
}
-/**
- * \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 DicomDirSeries
* \note : meaningfull only if GetFirstEntry already called
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 DicomDirSeries
* \return The last DicomDirSerie if found, otherwhise NULL
return NULL;
}
+
+/**
+ * \brief adds a new Visit at the beginning of the VisitList
+ * of a partially created DICOMDIR
+ */
+DicomDirVisit *DicomDirStudy::NewVisit()
+{
+ DicomDirVisit *dd = DicomDirVisit::New();
+ Visits.push_back(dd);
+ dd->Delete();
+ return dd;
+}
+
+/**
+ * \brief Remove all visits in the study
+ */
+void DicomDirStudy::ClearVisit()
+{
+ for(ListDicomDirVisit::iterator cc = Visits.begin();
+ cc != Visits.end();
+ ++cc )
+ {
+ (*cc)->Delete();
+ }
+ 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
return NULL;
}
+/**
+ * \brief Copies all the attributes from an other DocEntrySet
+ * @param set entry to copy from
+ * @remarks The contained DocEntries a not copied, only referenced
+ */
+void DicomDirStudy::Copy(DocEntrySet *set)
+{
+ // Remove all previous childs
+ ClearSerie();
+ ClearVisit();
+
+ DicomDirObject::Copy(set);
+
+ DicomDirStudy *ddEntry = dynamic_cast<DicomDirStudy *>(set);
+ if( ddEntry )
+ {
+ Series = ddEntry->Series;
+ for(ItSerie = Series.begin();ItSerie != Series.end();++ItSerie)
+ (*ItSerie)->Register();
+
+ Visits = ddEntry->Visits;
+ for(ItVisit = Visits.begin();ItVisit != Visits.end();++ItVisit)
+ (*ItVisit)->Register();
+ }
+}
+
//-----------------------------------------------------------------------------
// Protected