X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirStudy.cxx;h=5c28eec9cc4cef55fd5e98bc2d6cf00c71bd3bf3;hb=f2dd0107ba49eda3386b34715cdc0c046d12397f;hp=ea46883016c4c945d9cd54c1588ec25468278dcd;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx index ea468830..5c28eec9 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/10/12 04:35:45 $ - Version: $Revision: 1.14 $ + 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 @@ -19,101 +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 +/** + * \brief Constructor + * \note End user must use : DicomDirPatient::NewStudy() + */ +DicomDirStudy::DicomDirStudy(bool empty) + :DicomDirObject() +{ + if ( !empty ) + { + ListDicomDirStudyElem const &elemList = + Global::GetDicomDirElements()->GetDicomDirStudyElements(); + FillObject(elemList); + } +} + +/** + * \brief Canonical destructor. + */ +DicomDirStudy::~DicomDirStudy() +{ + ClearSerie(); +} + +//----------------------------------------------------------------------------- +// Public +/** + * \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 dummy, bool dummy2) +{ + DicomDirObject::WriteContent(fp, t, false, true); + + for(ListDicomDirSerie::iterator cc = Series.begin(); + cc!= Series.end(); + ++cc ) + { + (*cc)->WriteContent( fp, t, false, true ); + } + + for(ListDicomDirVisit::iterator icc = Visits.begin(); + icc!= Visits.end(); + ++icc ) + { + (*icc)->WriteContent( fp, t, false, true ); + } +} /** - * \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 adds a new Serie at the beginning of the SerieList + * of a partially created DICOMDIR */ -DicomDirStudy::DicomDirStudy(SQItem* s, TagDocEntryHT* ptagHT): - DicomDirObject(ptagHT) +DicomDirSerie *DicomDirStudy::NewSerie() { - docEntries = s->GetDocEntries(); + 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)->Delete(); + } + Series.clear(); } + /** - * \ingroup DicomDirStudy - * \brief constructor - * @param ptagHT pointer to the HTable (DicomDirObject needs it - * to build the HeaderEntries) + * \brief Get the first entry while visiting the DicomDirSeries + * \return The first DicomDirSerie if found, otherwhise NULL */ -DicomDirStudy::DicomDirStudy(TagDocEntryHT* ptagHT): - DicomDirObject(ptagHT) +DicomDirSerie *DicomDirStudy::GetFirstSerie() { + ItSerie = Series.begin(); + if (ItSerie != Series.end()) + return *ItSerie; + return NULL; } + /** - * \ingroup DicomDirStudy - * \brief Canonical destructor. + * \brief Get the next entry while visiting the DicomDirSeries + * \note : meaningfull only if GetFirstEntry already called + * \return The next DicomDirSerie if found, otherwhise NULL */ -DicomDirStudy::~DicomDirStudy() +DicomDirSerie *DicomDirStudy::GetNextSerie() { - for(ListDicomDirSerie::iterator cc = series.begin();cc != series.end();++cc) + gdcmAssertMacro (ItSerie != Series.end()); + + ++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()) { - delete *cc; + --ItSerie; + return *ItSerie; } + return NULL; } -//----------------------------------------------------------------------------- -// Print + /** - * \ingroup DicomDirStudy - * \brief Prints the Object - * @return - */ -void DicomDirStudy::Print(std::ostream& os) + * \brief adds a new Visit at the beginning of the VisitList + * of a partially created DICOMDIR + */ +DicomDirVisit *DicomDirStudy::NewVisit() { - os << "STUDY" << std::endl; - DicomDirObject::Print(os); + DicomDirVisit *dd = DicomDirVisit::New(); + Visits.push_back(dd); + dd->Delete(); + return dd; +} - for(ListDicomDirSerie::iterator cc = series.begin(); - cc != series.end(); - ++cc) +/** + * \brief Remove all visits in the study + */ +void DicomDirStudy::ClearVisit() +{ + for(ListDicomDirVisit::iterator cc = Visits.begin(); + cc != Visits.end(); + ++cc ) { - (*cc)->SetPrintLevel(PrintLevel); - (*cc)->Print(os); + (*cc)->Delete(); } + Visits.clear(); } -//----------------------------------------------------------------------------- -// Public +/** + * \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 Writes the Object - * @return - */ -void DicomDirStudy::Write(FILE* fp, FileType t) + * \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() { - DicomDirObject::Write(fp, t); + gdcmAssertMacro (ItVisit != Visits.end()); - for(ListDicomDirSerie::iterator cc = series.begin();cc!=series.end();++cc) + ++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()) { - (*cc)->Write( fp, t ); + --ItVisit; + return *ItVisit; } + return NULL; } /** - * \ingroup DicomDirStudy - * \brief adds a new Serie at the begining of the SerieList - * of a partially created DICOMDIR + * \brief Copies all the attributes from an other DocEntrySet + * @param set entry to copy from + * @remarks The contained DocEntries a not copied, only referenced */ -DicomDirSerie* DicomDirStudy::NewSerie() +void DicomDirStudy::Copy(DocEntrySet *set) { - std::list elemList = - Global::GetDicomDirElements()->GetDicomDirSerieElements(); + // Remove all previous childs + ClearSerie(); + ClearVisit(); + + DicomDirObject::Copy(set); - DicomDirSerie* st = new DicomDirSerie(PtagHT); - FillObject(elemList); - series.push_front(st); + 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 @@ -121,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