X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=5e34175cd02c3c1a27c297c3ff31b399dc44b62b;hb=56ad78cdf3b5de32f0a94a38cd32ddc9f403ffc3;hp=d15c62efa8c92aab7728a43a197614042599417b;hpb=1bae8d2ba47d1b9cc8acfb7b5ab82026e48275dd;p=gdcm.git diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx index d15c62ef..5e34175c 100644 --- a/src/gdcmDicomDirStudy.cxx +++ b/src/gdcmDicomDirStudy.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirStudy.cxx,v $ Language: C++ - Date: $Date: 2004/11/25 15:46:11 $ - Version: $Revision: 1.18 $ + Date: $Date: 2007/10/08 15:20:17 $ + Version: $Revision: 1.46 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,104 +19,226 @@ #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirElement.h" #include "gdcmGlobal.h" +#include "gdcmDicomDirSerie.h" +#include "gdcmDicomDirVisit.h" +#include "gdcmDebug.h" -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor - /** - * \ingroup DicomDirStudy - * \brief constructor - * @param s SQ Item holding the elements related to this "STUDY" part - * @param ptagHT pointer to the HTable (DicomDirObject needs it - * to build the HeaderEntries) + * \brief Constructor + * \note End user must use : DicomDirPatient::NewStudy() */ -DicomDirStudy::DicomDirStudy(SQItem* s, TagDocEntryHT* ptagHT): - DicomDirObject(ptagHT) +DicomDirStudy::DicomDirStudy(bool empty) + :DicomDirObject() { - DocEntries = s->GetDocEntries(); + if ( !empty ) + { + ListDicomDirStudyElem const &elemList = + Global::GetDicomDirElements()->GetDicomDirStudyElements(); + FillObject(elemList); + } } + /** - * \ingroup DicomDirStudy - * \brief constructor - * @param ptagHT pointer to the HTable (DicomDirObject needs it - * to build the HeaderEntries) + * \brief Canonical destructor. */ -DicomDirStudy::DicomDirStudy(TagDocEntryHT* ptagHT): - DicomDirObject(ptagHT) +DicomDirStudy::~DicomDirStudy() { + ClearSerie(); } + +//----------------------------------------------------------------------------- +// Public /** - * \ingroup DicomDirStudy - * \brief Canonical destructor. - */ -DicomDirStudy::~DicomDirStudy() + * \brief Writes the Object + * @param fp ofstream to write to + * @param t Type of the File (explicit VR, implicitVR, ...) + * @return + */ +void DicomDirStudy::WriteContent(std::ofstream *fp, FileType t, bool , bool ) { + DicomDirObject::WriteContent(fp, t, false, true); + for(ListDicomDirSerie::iterator cc = Series.begin(); - cc != Series.end(); + cc!= Series.end(); ++cc ) { - delete *cc; + (*cc)->WriteContent( fp, t, false, true ); + } + + for(ListDicomDirVisit::iterator icc = Visits.begin(); + icc!= Visits.end(); + ++icc ) + { + (*icc)->WriteContent( fp, t, false, true ); } } -//----------------------------------------------------------------------------- -// Print /** - * \ingroup DicomDirStudy - * \brief Prints the Object - * @return - */ -void DicomDirStudy::Print(std::ostream& os) + * \brief adds a new Serie at the beginning of the SerieList + * of a partially created DICOMDIR + */ +DicomDirSerie *DicomDirStudy::NewSerie() { - os << "STUDY" << std::endl; - DicomDirObject::Print(os); + DicomDirSerie *dd = DicomDirSerie::New(); + Series.push_back(dd); + return dd; +} +/** + * \brief Remove all series in the study + */ +void DicomDirStudy::ClearSerie() +{ for(ListDicomDirSerie::iterator cc = Series.begin(); cc != Series.end(); - ++cc) + ++cc ) { - (*cc)->SetPrintLevel(PrintLevel); - (*cc)->Print(os); + (*cc)->Delete(); } + Series.clear(); } -//----------------------------------------------------------------------------- -// Public +/** + * \brief Get the first entry while visiting the DicomDirSeries + * \return The first DicomDirSerie if found, otherwhise NULL + */ +DicomDirSerie *DicomDirStudy::GetFirstSerie() +{ + ItSerie = Series.begin(); + if (ItSerie != Series.end()) + return *ItSerie; + return NULL; +} /** - * \brief Writes the Object - * @return - */ -void DicomDirStudy::WriteContent(std::ofstream* fp, FileType t) + * \brief Get the next entry while visiting the DicomDirSeries + * \note : meaningfull only if GetFirstEntry already called + * \return The next DicomDirSerie if found, otherwhise NULL + */ +DicomDirSerie *DicomDirStudy::GetNextSerie() { - DicomDirObject::WriteContent(fp, t); + gdcmAssertMacro (ItSerie != Series.end()); - for(ListDicomDirSerie::iterator cc = Series.begin(); - cc!= Series.end(); - ++cc ) + ++ItSerie; + if (ItSerie != Series.end()) + return *ItSerie; + return NULL; +} + +/** + * \brief Get the last entry while visiting the DicomDirSeries + * \return The last DicomDirSerie if found, otherwhise NULL + */ +DicomDirSerie *DicomDirStudy::GetLastSerie() +{ + ItSerie = Series.end(); + if (ItSerie != Series.begin()) { - (*cc)->WriteContent( fp, t ); + --ItSerie; + return *ItSerie; } + return NULL; } + /** - * \ingroup DicomDirStudy - * \brief adds a new Serie at the begining of the SerieList + * \brief adds a new Visit at the beginning of the VisitList * of a partially created DICOMDIR */ -DicomDirSerie* DicomDirStudy::NewSerie() +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() { - ListDicomDirSerieElem const & elemList = - Global::GetDicomDirElements()->GetDicomDirSerieElements(); + for(ListDicomDirVisit::iterator cc = Visits.begin(); + cc != Visits.end(); + ++cc ) + { + (*cc)->Delete(); + } + Visits.clear(); +} - DicomDirSerie* st = new DicomDirSerie(PtagHT); - FillObject(elemList); - Series.push_front(st); +/** + * \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; +} + +/** + * \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(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(); + } +} - return st; -} //----------------------------------------------------------------------------- // Protected @@ -124,5 +246,35 @@ DicomDirSerie* DicomDirStudy::NewSerie() // 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