X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirSerie.cxx;h=99a96c2d61c0709d8ce4a70fad784b62cdadf3b8;hb=b06cbd9177331d793223eac6bf8b2bccf874e7e3;hp=24529ce3ea45f891cd54726ed2092e6dde4d8fbd;hpb=fec70eb0129b86c02e256a069d3eec45c6c43e46;p=gdcm.git diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx index 24529ce3..99a96c2d 100644 --- a/src/gdcmDicomDirSerie.cxx +++ b/src/gdcmDicomDirSerie.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirSerie.cxx,v $ Language: C++ - Date: $Date: 2005/01/17 10:59:52 $ - Version: $Revision: 1.27 $ + 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,114 +19,194 @@ #include "gdcmDicomDirSerie.h" #include "gdcmDicomDirElement.h" #include "gdcmDicomDirImage.h" +#include "gdcmDicomDirPrivate.h" #include "gdcmGlobal.h" +#include "gdcmDebug.h" -namespace gdcm +namespace GDCM_NAME_SPACE { - //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \brief Constructor + * \brief Constructor + * \note End user must use : DicomDirStudy::NewSerie() */ -DicomDirSerie::DicomDirSerie(): +DicomDirSerie::DicomDirSerie(bool empty): DicomDirObject() { + if ( !empty ) + { + ListDicomDirSerieElem const &elemList = + Global::GetDicomDirElements()->GetDicomDirSerieElements(); + FillObject(elemList); + } } + /** * \brief Canonical destructor. */ DicomDirSerie::~DicomDirSerie() { - for(ListDicomDirImage::iterator cc = Images.begin(); - cc != Images.end(); - ++cc) - { - delete *cc; - } + ClearImage(); + ClearPrivate(); // For SIEMENS 'CSA non image' } //----------------------------------------------------------------------------- -// Print +// Public /** - * \brief Prints the Object - * @param os ostream to write to + * \brief Writes the Object + * @param fp ofstream to write to + * @param t Type of the File (explicit VR, implicitVR, ...) */ -void DicomDirSerie::Print(std::ostream &os, std::string const &) +void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t, bool dummy, bool dummy2) { - os << "SERIE" << std::endl; - DicomDirObject::Print(os); + DicomDirObject::WriteContent(fp, t, false, true); for(ListDicomDirImage::iterator cc = Images.begin(); - cc != Images.end(); - ++cc) + cc!= Images.end(); + ++cc ) { - (*cc)->SetPrintLevel(PrintLevel); - (*cc)->Print(os); - } + (*cc)->WriteContent( fp, t, false, true ); + } + for(ListDicomDirPrivate::iterator cc2 = Privates.begin(); + cc2!= Privates.end(); + ++cc2 ) + { + (*cc2)->WriteContent( fp, t, false, true); + } } -//----------------------------------------------------------------------------- -// Public +/** + * \brief adds a new Image (with the basic elements) to a partially created + * DICOMDIR + */ +DicomDirImage *DicomDirSerie::NewImage() +{ + DicomDirImage *dd = DicomDirImage::New(); + Images.push_back(dd); + return dd; +} /** - * \brief Writes the Object - * @param fp ofstream to write to - * @param t Type of the File (explicit VR, implicitVR, ...) - */ -void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t) + * \brief adds a new Private (with the basic elements) to a partially created + * DICOMDIR + */ + +DicomDirPrivate *DicomDirSerie::NewPrivate() { - DicomDirObject::WriteContent(fp, t); + DicomDirPrivate *dd = DicomDirPrivate::New(); + Privates.push_back(dd); + return dd; +} +/** + * \brief Remove all 'Privates' in the serie + */ +void DicomDirSerie::ClearPrivate() +{ + for(ListDicomDirPrivate::iterator cc = Privates.begin(); + cc!= Privates.end(); + ++cc) + { + (*cc)->Delete(); + } + Privates.clear(); +} + +/** + * \brief Remove all 'Images' in the serie + */ +void DicomDirSerie::ClearImage() +{ for(ListDicomDirImage::iterator cc = Images.begin(); cc!= Images.end(); - ++cc ) + ++cc) { - (*cc)->WriteContent( fp, t ); + (*cc)->Delete(); } + Images.clear(); } /** - * \brief adds a new Image (with the basic elements) to a partially created DICOMDIR + * \brief Get the first entry while visiting the DicomDirImage + * \return The first DicomDirImage if DicomDirserie not empty, otherwhise NULL */ -DicomDirImage *DicomDirSerie::NewImage() +DicomDirImage *DicomDirSerie::GetFirstImage() +{ + ItImage = Images.begin(); + if (ItImage != Images.end()) + return *ItImage; + return NULL; +} + +/** + * \brief Get the next entry while visiting the DicomDirImages + * \note : meaningfull only if GetFirstImage already called + * \return The next DicomDirImages if found, otherwhise NULL + */ +DicomDirImage *DicomDirSerie::GetNextImage() { - ListDicomDirImageElem const &elemList = - Global::GetDicomDirElements()->GetDicomDirImageElements(); + gdcmAssertMacro (ItImage != Images.end()); - DicomDirImage *st = new DicomDirImage(); - FillObject(elemList); - Images.push_front(st); + ++ItImage; + if (ItImage != Images.end()) + return *ItImage; + return NULL; +} - return st; +/** + * \brief Get the first entry while visiting the DicomDirPrivate + * \return The first DicomDirPrivate if DicomDirserie not empty, otherwhise NULL + */ +DicomDirPrivate *DicomDirSerie::GetFirstPrivate() +{ + ItPrivate = Privates.begin(); + if (ItPrivate != Privates.end()) + return *ItPrivate; + return NULL; } /** - * \brief Initialise the visit of the Images + * \brief Get the next entry while visiting the DicomDirPrivates + * \note : meaningfull only if GetFirstPrivate already called + * \return The next DicomDirPrivates if found, otherwhise NULL */ -void DicomDirSerie::InitTraversal() +DicomDirPrivate *DicomDirSerie::GetNextPrivate() { - ItDicomDirImage = Images.begin(); + gdcmAssertMacro (ItPrivate != Privates.end()); + + ++ItPrivate; + if (ItPrivate != Privates.end()) + return *ItPrivate; + return NULL; } /** - * \brief Get the next entry while visiting the DicomDirImages - * \return The next DicomDirImages if found, otherwhise 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 */ -DicomDirImage *DicomDirSerie::GetNextEntry() +void DicomDirSerie::Copy(DocEntrySet *set) { - if (ItDicomDirImage != Images.end()) - { - DicomDirImage *tmp = *ItDicomDirImage; - ++ItDicomDirImage; - return tmp; - } - else + // Remove all previous childs + ClearImage(); + ClearPrivate(); + + DicomDirObject::Copy(set); + + DicomDirSerie *ddEntry = dynamic_cast(set); + if( ddEntry ) { - return NULL; - } + Images = ddEntry->Images; + for(ItImage = Images.begin();ItImage != Images.end();++ItImage) + (*ItImage)->Register(); + + Privates = ddEntry->Privates; + for(ItPrivate = Privates.begin();ItPrivate != Privates.end();++ItPrivate) + (*ItPrivate)->Register(); + } } - + //----------------------------------------------------------------------------- // Protected @@ -134,6 +214,34 @@ DicomDirImage *DicomDirSerie::GetNextEntry() // Private //----------------------------------------------------------------------------- -} // end namespace gdcm +// Print +/** + * \brief Prints the Object + * @param os ostream to write to + * @param indent Indentation string to be prepended during printing + */ +void DicomDirSerie::Print(std::ostream &os, std::string const &) +{ + os << "SERIE" << std::endl; + DicomDirObject::Print(os); + for(ListDicomDirImage::iterator cc = Images.begin(); + cc != Images.end(); + ++cc) + { + (*cc)->SetPrintLevel(PrintLevel); + (*cc)->Print(os); + } + for(ListDicomDirPrivate::iterator cc2 = Privates.begin(); + cc2 != Privates.end(); + ++cc2) + { + (*cc2)->SetPrintLevel(PrintLevel); + (*cc2)->Print(os); + } + +} + +//----------------------------------------------------------------------------- +} // end namespace gdcm