X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirSerie.cxx;h=6b0d8f9ae33ebe6bef67dff866fe91e03593da12;hb=46219bf8615127f9ab240e9bcc2efa30ba503b04;hp=9cfc3fb4f2edce1bd933a10173a4c37d0af0f58f;hpb=2df4df63b316830fda1354cafd59ffe8da54e35d;p=gdcm.git diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx index 9cfc3fb4..6b0d8f9a 100644 --- a/src/gdcmDicomDirSerie.cxx +++ b/src/gdcmDicomDirSerie.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirSerie.cxx,v $ Language: C++ - Date: $Date: 2007/05/23 14:01:44 $ - Version: $Revision: 1.42 $ + 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 @@ -23,7 +23,7 @@ #include "gdcmGlobal.h" #include "gdcmDebug.h" -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor @@ -58,21 +58,21 @@ DicomDirSerie::~DicomDirSerie() * @param fp ofstream to write to * @param t Type of the File (explicit VR, implicitVR, ...) */ -void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t) +void DicomDirSerie::WriteContent(std::ofstream *fp, FileType t, bool , bool ) { - DicomDirObject::WriteContent(fp, t); + DicomDirObject::WriteContent(fp, t, false, true); for(ListDicomDirImage::iterator cc = Images.begin(); cc!= Images.end(); ++cc ) { - (*cc)->WriteContent( fp, t ); + (*cc)->WriteContent( fp, t, false, true ); } for(ListDicomDirPrivate::iterator cc2 = Privates.begin(); cc2!= Privates.end(); ++cc2 ) { - (*cc2)->WriteContent( fp, t ); + (*cc2)->WriteContent( fp, t, false, true); } } @@ -113,7 +113,6 @@ void DicomDirSerie::ClearPrivate() Privates.clear(); } - /** * \brief Remove all 'Images' in the serie */ @@ -127,6 +126,7 @@ void DicomDirSerie::ClearImage() } Images.clear(); } + /** * \brief Get the first entry while visiting the DicomDirImage * \return The first DicomDirImage if DicomDirserie not empty, otherwhise NULL