X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHeader.cxx;h=05f2ecef1d6be1e665e3924081ef317802459609;hb=963480c814326423065a4a02fa1bf8bc1243ae4f;hp=2c61c933570722ddcdfa74871eeb61beaae317d6;hpb=fccdf8e6409f9cf8c2a66a658dcfdfb7a332cbb9;p=gdcm.git diff --git a/src/gdcmSerieHeader.cxx b/src/gdcmSerieHeader.cxx index 2c61c933..05f2ecef 100644 --- a/src/gdcmSerieHeader.cxx +++ b/src/gdcmSerieHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSerieHeader.cxx,v $ Language: C++ - Date: $Date: 2005/01/14 21:30:53 $ - Version: $Revision: 1.7 $ + Date: $Date: 2005/01/18 08:01:42 $ + Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -66,6 +66,8 @@ void SerieHeader::AddFileName(std::string const &filename) { // 0020 000e UI REL Series Instance UID std::string uid = header->GetEntry (0x0020, 0x000e); + // if uid == GDCM_UNFOUND then consistenly we should find GDCM_UNFOUND + // no need here to do anything special if( CurrentSerieUID == "" ) { // Set the current one @@ -95,9 +97,10 @@ void SerieHeader::AddFileName(std::string const &filename) void SerieHeader::SetDirectory(std::string const &dir) { CurrentSerieUID = ""; //Reset previous Serie Instance UID - DirList filenames_list(dir); //OS specific + DirList dirList(dir); //OS specific - for( DirList::const_iterator it = filenames_list.begin(); + DirListType filenames_list = dirList.GetFilenames(); + for( DirListType::const_iterator it = filenames_list.begin(); it != filenames_list.end(); ++it) { AddFileName( *it ); @@ -132,7 +135,6 @@ void SerieHeader::OrderGdcmFileList() //----------------------------------------------------------------------------- // Private /** - * \ingroup Header * \brief sorts the images, according to their Patient Position * We may order, considering : * -# Image Number @@ -254,7 +256,6 @@ bool SerieHeader::ImagePositionPatientOrdering() } /** - * \ingroup Header * \brief sorts the images, according to their Image Number * @return false only if the header is bugged ! */ @@ -317,7 +318,6 @@ bool SerieHeader::ImageNumberOrdering() /** - * \ingroup Header * \brief sorts the images, according to their File Name * @return false only if the header is bugged ! */