X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.cxx;h=df093b33c7bb4fb917e759b686ad6f64bdd1a136;hb=a585fafed1e72e092c6a1942c8692991c1688e7f;hp=893cc48ec86aa8d80841d3f4865a134e3cd8b4f2;hpb=6cf34d5df01e8ec0572bcef6c6b91be58212ef77;p=gdcm.git diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx index 893cc48e..df093b33 100644 --- a/src/gdcmSerieHelper.cxx +++ b/src/gdcmSerieHelper.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSerieHelper.cxx,v $ Language: C++ - Date: $Date: 2005/06/03 16:08:16 $ - Version: $Revision: 1.9 $ + Date: $Date: 2005/11/21 09:46:27 $ + Version: $Revision: 1.35 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,15 +19,19 @@ #include "gdcmSerieHelper.h" #include "gdcmDirList.h" #include "gdcmFile.h" +#include "gdcmDictEntry.h" // for TranslateToKey #include "gdcmDebug.h" #include "gdcmUtil.h" #include #include +#include #include +#include //for sscanf namespace gdcm { +//----------------------------------------------------------------------------- //----------------------------------------------------------------------------- // Constructor / Destructor @@ -36,21 +40,9 @@ namespace gdcm */ SerieHelper::SerieHelper() { - // For all the File lists of the gdcm::Serie - FileList *l = GetFirstCoherentFileList(); - while (l) - { - // For all the files of a File list - for (FileList::iterator it = l->begin(); - it != l->end(); - ++it) - { - delete *it; - } - l->clear(); - delete l;; - l = GetNextCoherentFileList(); - } + ClearAll(); + UserLessThanFunction = 0; + DirectOrder = true; } /** @@ -58,20 +50,29 @@ SerieHelper::SerieHelper() */ SerieHelper::~SerieHelper() { - // For all the Coherent File lists of the gdcm::Serie - FileList *l = GetFirstCoherentFileList(); + ClearAll(); +} + +/** + * \brief Preventively, clear everything at constructor time. + * ( use it at destructor time.) + */ +void SerieHelper::ClearAll() +{ + // For all the 'Single SerieUID' Filesets that may already exist + FileList *l = GetFirstSingleSerieUIDFileSet(); while (l) { - // For all the files of a Coherent File list - for (FileList::iterator it = l->begin(); - it != l->end(); - ++it) + // For all the gdcm::File of a File set + for (gdcm::FileList::iterator it = l->begin(); + it != l->end(); + ++it) { - delete *it; + (*it)->Delete(); // remove each entry } l->clear(); - delete l; - l = GetNextCoherentFileList(); + delete l; // remove the container + l = GetNextSingleSerieUIDFileSet(); } } @@ -81,81 +82,156 @@ SerieHelper::~SerieHelper() // Public /** - * \brief add a gdcm::File to the list corresponding to its Serie UID + * \brief add a gdcm::File to the Fileset corresponding to its Serie UID * @param filename Name of the file to deal with */ void SerieHelper::AddFileName(std::string const &filename) { // Create a DICOM file - File *header = new File( filename ); - if( header->IsReadable() ) + File *header = File::New(); + header->SetLoadMode(LoadMode); + header->SetFileName( filename ); + header->Load(); + + if ( header->IsReadable() ) { int allrules = 1; - // First step the user has defined s set of rules for the DICOM he is looking for - // make sure the file correspond to his set of rules: - for(SerieRestrictions::iterator it = Restrictions.begin(); - it != Restrictions.end(); - ++it) + // First step : the user defined a set of rules for the DICOM file + // he is looking for. + // Make sure the file corresponds to his set of rules: + + std::string s; + for(SerieExRestrictions::iterator it2 = ExRestrictions.begin(); + it2 != ExRestrictions.end(); + ++it2) { - const Rule &r = *it; - const std::string s;// = header->GetEntryValue( r.first ); - if( !Util::DicomStringEqual(s, r.second.c_str())) + const ExRule &r = *it2; + s = header->GetEntryString( r.group, r.elem ); + if ( !Util::CompareDicomString(s, r.value.c_str(), r.op) ) { - // Argh ! This rule is unmatch let's just quit + // Argh ! This rule is unmatched; let's just quit + allrules = 0; break; } } - if( allrules ) // all rules are respected: + + if ( allrules ) // all rules are respected: { - // Alright ! we have a found a DICOM that match the user expectation. - // Let's add it ! + // Allright! we have a found a DICOM that matches the user expectation. + // Let's add it! // 0020 000e UI REL Series Instance UID - const std::string &uid = header->GetEntryValue (0x0020, 0x000e); + const std::string &uid = header->GetEntryString(0x0020, 0x000e); // if uid == GDCM_UNFOUND then consistently we should find GDCM_UNFOUND // no need here to do anything special - if ( CoherentFileListHT.count(uid) == 0 ) + + if ( SingleSerieUIDFileSetHT.count(uid) == 0 ) { gdcmDebugMacro(" New Serie UID :[" << uid << "]"); // create a std::list in 'uid' position - CoherentFileListHT[uid] = new FileList; + SingleSerieUIDFileSetHT[uid] = new FileList; } - // Current Serie UID and DICOM header seems to match add the file: - CoherentFileListHT[uid]->push_back( header ); + // Current Serie UID and DICOM header seems to match; add the file: + SingleSerieUIDFileSetHT[uid]->push_back( header ); } else { - // at least one rule was unmatch we need to deallocate the file: - delete header; + // at least one rule was unmatched we need to deallocate the file: + header->Delete(); } } else { gdcmWarningMacro("Could not read file: " << filename ); - delete header; + header->Delete(); } } + +/** + * \brief add a gdcm::File to the first (and supposed to be unique) file set + * of the gdcm::SerieHelper. + * \warning : this method should be used by aware users only! + * Passing a gdcm::File* has the same effect than passing a file name! + * \todo : decide which one is wrong (the method, or the commentary)! + * the following comment doesn't match the method :-( + * User is supposed to know the files he want to deal with + * and consider them they belong to the same Serie + * (even if their Serie UID is different) + * user will probabely OrderFileList() this list (actually, ordering + * user choosen gdm::File is the sole interest of this method) + * Moreover, using vtkGdcmReader::SetCoherentFileList() will avoid + * vtkGdcmReader parsing twice the same files. + * *no* coherence check is performed, but those specified + * by SerieHelper::AddRestriction() + * @param header gdcm::File* of the file to deal with + */ +void SerieHelper::AddGdcmFile(File *header) +{ + int allrules = 1; + // First step the user has defined a set of rules for the DICOM + // he is looking for. + // make sure the file correspond to his set of rules: + for(SerieRestrictions::iterator it = Restrictions.begin(); + it != Restrictions.end(); + ++it) + { + const Rule &r = *it; + const std::string s;// = header->GetEntryValue( r.first ); + if ( !Util::DicomStringEqual(s, r.second.c_str()) ) + { + // Argh ! This rule is unmatch let's just quit + allrules = 0; + break; + } + } + if ( allrules ) // all rules are respected: + { + // Allright ! we have a found a DICOM that match the user expectation. + // Let's add it ! + + const std::string &uid = "0"; + // Serie UID of the gdcm::File* may be different. + // User is supposed to know what he wants + + if ( SingleSerieUIDFileSetHT.count(uid) == 0 ) + { + gdcmDebugMacro(" New Serie UID :[" << uid << "]"); + // create a std::list in 'uid' position + SingleSerieUIDFileSetHT[uid] = new FileList; + } + // Current Serie UID and DICOM header seems to match; add the file: + SingleSerieUIDFileSetHT[uid]->push_back( header ); + } + // Even if a rule was unmatch we don't deallocate the gdcm::File: +} + /** * \brief add a rules for restricting a DICOM file to be in the serie we are * trying to find. For example you can select only the DICOM file from a * directory which would have a particular EchoTime==4.0. * This method is a user level, value is not required to be formatted as a DICOM * string + * @param key Target tag we want restrict on a given value + * @param value value to be checked to exclude File + * @param op operator we want to use to check */ -void SerieHelper::AddRestriction(TagKey const &key, std::string const &value) +void SerieHelper::AddRestriction(TagKey const &key, + std::string const &value, int op) { - Rule r; - r.first = key; - r.second = value; - Restrictions.push_back( r ); + ExRule r; + r.group = key[0]; + r.elem = key[1]; + r.value = value; + r.op = op; + ExRestrictions.push_back( r ); } /** * \brief Sets the root Directory * @param dir Name of the directory to deal with - * @param recursive whether we want explore recursively the Directory + * @param recursive whether we want explore recursively the root Directory */ void SerieHelper::SetDirectory(std::string const &dir, bool recursive) { @@ -170,64 +246,304 @@ void SerieHelper::SetDirectory(std::string const &dir, bool recursive) } /** - * \brief Sorts the given File List + * \brief Sorts the given Fileset * \warning This could be implemented in a 'Strategy Pattern' approach * But as I don't know how to do it, I leave it this way - * BTW, this is also a Strategy, I don't know this is the best approach :) + * BTW, this is also a Strategy, I don't know this is + * the best approach :) */ -void SerieHelper::OrderFileList(FileList *coherentFileList) +void SerieHelper::OrderFileList(FileList *fileSet) { - if( ImagePositionPatientOrdering( coherentFileList ) ) + + if ( SerieHelper::UserLessThanFunction ) + { + UserOrdering( fileSet ); + return; + } + else if ( ImagePositionPatientOrdering( fileSet ) ) { return ; } - else if( ImageNumberOrdering(coherentFileList ) ) + else if ( ImageNumberOrdering(fileSet ) ) { return ; } else { - FileNameOrdering(coherentFileList ); + FileNameOrdering(fileSet ); } } /** - * \brief Get the first List while visiting the CoherentFileListHT - * @return The first FileList if found, otherwhise NULL - */ + * \brief Elementary coherence checking of the files with the same Serie UID + * Only sizes and pixel type are checked right now ... + */ +bool SerieHelper::IsCoherent(FileList *fileSet) +{ + if(fileSet->size() == 1) + return true; + + FileList::const_iterator it = fileSet->begin(); + + int nX = (*it)->GetXSize(); + int nY = (*it)->GetYSize(); + int pixelSize = (*it)->GetPixelSize(); + bool signedPixelData = (*it)->IsSignedPixelData(); + it ++; + for ( ; + it != fileSet->end(); + ++it) + { + if ( (*it)->GetXSize() != nX ) + return false; + if ( (*it)->GetYSize() != nY ) + return false; + if ( (*it)->GetPixelSize() != pixelSize ) + return false; + if ( (*it)->IsSignedPixelData() != signedPixelData ) + return false; + // probabely more is to be checked (?) + } + return true; +} + +#ifndef GDCM_LEGACY_REMOVE + FileList *SerieHelper::GetFirstCoherentFileList() { - ItListHt = CoherentFileListHT.begin(); - if( ItListHt != CoherentFileListHT.end() ) - return ItListHt->second; + ItFileSetHt = SingleSerieUIDFileSetHT.begin(); + if ( ItFileSetHt != SingleSerieUIDFileSetHT.end() ) + return ItFileSetHt->second; + return NULL; +} + + +FileList *SerieHelper::GetNextCoherentFileList() +{ + gdcmAssertMacro (ItFileSetHt != SingleSerieUIDFileSetHT.end()); + + ++ItFileSetHt; + if ( ItFileSetHt != SingleSerieUIDFileSetHT.end() ) + return ItFileSetHt->second; + return NULL; +} + + +FileList *SerieHelper::GetCoherentFileList(std::string SerieUID) +{ + if ( SingleSerieUIDFileSetHT.count(SerieUID) == 0 ) + return 0; + return SingleSerieUIDFileSetHT[SerieUID]; +} +#endif + + +/** + * \brief Get the first Fileset while visiting the SingleSerieUIDFileSetmap + * @return The first FileList (SingleSerieUIDFileSet) if found, otherwhise 0 + */ +FileList *SerieHelper::GetFirstSingleSerieUIDFileSet() +{ + ItFileSetHt = SingleSerieUIDFileSetHT.begin(); + if ( ItFileSetHt != SingleSerieUIDFileSetHT.end() ) + return ItFileSetHt->second; return NULL; } /** - * \brief Get the next List while visiting the CoherentFileListHT - * \note : meaningfull only if GetFirstCoherentFileList already called - * @return The next FileList if found, otherwhise NULL + * \brief Get the next Fileset while visiting the SingleSerieUIDFileSetmap + * \note : meaningfull only if GetNextSingleSerieUIDFileSet() already called + * @return The next FileList (SingleSerieUIDFileSet) if found, otherwhise 0 */ -FileList *SerieHelper::GetNextCoherentFileList() +FileList *SerieHelper::GetNextSingleSerieUIDFileSet() { - gdcmAssertMacro (ItListHt != CoherentFileListHT.end()); + gdcmAssertMacro (ItFileSetHt != SingleSerieUIDFileSetHT.end()); - ++ItListHt; - if ( ItListHt != CoherentFileListHT.end() ) - return ItListHt->second; + ++ItFileSetHt; + if ( ItFileSetHt != SingleSerieUIDFileSetHT.end() ) + return ItFileSetHt->second; return NULL; } /** - * \brief Get the Coherent Files list according to its Serie UID - * @param SerieUID SerieUID - * \return pointer to the Coherent Files list if found, otherwhise NULL + * \brief Get the SingleSerieUIDFileSet according to its Serie UID + * @param SerieUID SerieUID to retrieve + * \return pointer to the FileList (SingleSerieUIDFileSet) if found, otherwhise 0 */ -FileList *SerieHelper::GetCoherentFileList(std::string SerieUID) +FileList *SerieHelper::GetSingleSerieUIDFileSet(std::string SerieUID) { - if ( CoherentFileListHT.count(SerieUID) == 0 ) + if ( SingleSerieUIDFileSetHT.count(SerieUID) == 0 ) return 0; - return CoherentFileListHT[SerieUID]; + return SingleSerieUIDFileSetHT[SerieUID]; +} + +/** + * \brief Splits a Single SerieUID Fileset according to the Orientations + * @param fileSet File Set to be splitted + * \return std::map of 'Xcoherent' File sets + */ + +XCoherentFileSetmap SerieHelper::SplitOnOrientation(FileList *fileSet) +{ + XCoherentFileSetmap CoherentFileSet; + + int nb = fileSet->size(); + if (nb == 0 ) + return CoherentFileSet; + float iop[6]; + + std::string strOrient; + std::ostringstream ossOrient; + FileList::const_iterator it = fileSet->begin(); + it ++; + for ( ; + it != fileSet->end(); + ++it) + { + // Information is in : + // 0020 0037 : Image Orientation (Patient) or + // 0020 0035 : Image Orientation (RET) + + // Let's build again the 'cosines' string, to be sure of it's format + (*it)->GetImageOrientationPatient(iop); + + ossOrient << iop[0]; + for (int i = 1; i < 6; i++) + { + ossOrient << "\\"; + ossOrient << iop[i]; + } + strOrient = ossOrient.str(); + ossOrient.str(""); + // FIXME : is it a 'cleaner' way to initialize an ostringstream? + + if ( CoherentFileSet.count(strOrient) == 0 ) + { + gdcmDebugMacro(" New Orientation :[" << strOrient << "]"); + // create a File set in 'orientation' position + CoherentFileSet[strOrient] = new FileList; + } + // Current Orientation and DICOM header match; add the file: + CoherentFileSet[strOrient]->push_back( (*it) ); + } + return CoherentFileSet; +} + +/** + * \brief Splits a 'Single SerieUID' Fileset according to the Positions + * @param fileSet File Set to be splitted + * \return std::map of 'Xcoherent' File sets + */ + +XCoherentFileSetmap SerieHelper::SplitOnPosition(FileList *fileSet) +{ + XCoherentFileSetmap CoherentFileSet; + + int nb = fileSet->size(); + if (nb == 0 ) + return CoherentFileSet; + float pos[3]; + std::string strImPos; // read on disc + std::ostringstream ossPosition; + std::string strPosition; // re computed + FileList::const_iterator it = fileSet->begin(); + it ++; + for ( ; + it != fileSet->end(); + ++it) + { + // Information is in : + // 0020,0032 : Image Position Patient + // 0020,0030 : Image Position (RET) + + strImPos = (*it)->GetEntryString(0x0020,0x0032); + if ( strImPos == GDCM_UNFOUND) + { + gdcmWarningMacro( "Unfound Image Position Patient (0020,0032)"); + strImPos = (*it)->GetEntryString(0x0020,0x0030); // For ACR-NEMA images + if ( strImPos == GDCM_UNFOUND ) + { + gdcmWarningMacro( "Unfound Image Position (RET) (0020,0030)"); + // User wants to split on the 'Position' + // No 'Position' info found. + // We return an empty Htable ! + return CoherentFileSet; + } + } + + if ( sscanf( strImPos.c_str(), "%f \\%f \\%f ", + &pos[0], &pos[1], &pos[2]) != 3 ) + { + gdcmWarningMacro( "Wrong number for Position : [" + << strImPos << "]" ); + return CoherentFileSet; + } + + // Let's build again the 'position' string, to be sure of it's format + + ossPosition << pos[0]; + for (int i = 1; i < 3; i++) + { + ossPosition << "\\"; + ossPosition << pos[i]; + } + strPosition = ossPosition.str(); + ossPosition.str(""); + + if ( CoherentFileSet.count(strPosition) == 0 ) + { + gdcmDebugMacro(" New Position :[" << strPosition << "]"); + // create a File set in 'position' position + CoherentFileSet[strPosition] = new FileList; + } + // Current Position and DICOM header match; add the file: + CoherentFileSet[strPosition]->push_back( (*it) ); + } + return CoherentFileSet; +} + +/** + * \brief Splits a 'Single SerieUID' File set Coherent according to the + * value of a given Tag + * @param fileSet File Set to be splitted + * @param group group number of the target Element + * @param elem element number of the target Element + * \return std::map of 'Xcoherent' File sets + */ + +XCoherentFileSetmap SerieHelper::SplitOnTagValue(FileList *fileSet, + uint16_t group, uint16_t elem) +{ + XCoherentFileSetmap CoherentFileSet; + + int nb = fileSet->size(); + if (nb == 0 ) + return CoherentFileSet; + + std::string strTagValue; // read on disc + + FileList::const_iterator it = fileSet->begin(); + it ++; + for ( ; + it != fileSet->end(); + ++it) + { + // Information is in : + // 0020,0032 : Image Position Patient + // 0020,0030 : Image Position (RET) + + strTagValue = (*it)->GetEntryString(group,elem); + + if ( CoherentFileSet.count(strTagValue) == 0 ) + { + gdcmDebugMacro(" New Tag Value :[" << strTagValue << "]"); + // create a File set in 'position' position + CoherentFileSet[strTagValue] = new FileList; + } + // Current Tag value and DICOM header match; add the file: + CoherentFileSet[strTagValue]->push_back( (*it) ); + } + return CoherentFileSet; } //----------------------------------------------------------------------------- @@ -236,17 +552,19 @@ FileList *SerieHelper::GetCoherentFileList(std::string SerieUID) //----------------------------------------------------------------------------- // Private /** - * \brief sorts the images, according to their Patient Position + * \brief sorts the images, according to their Patient Position. + * * We may order, considering : * -# Image Position Patient * -# Image Number + * -# file name * -# More to come :-) - * WARNING : FileList = std::vector + * \note : FileList = std::vector * @param fileList Coherent File list (same Serie UID) to sort * @return false only if the header is bugged ! */ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) -//based on Jolinda's algorithm +//based on Jolinda Smith's algorithm { //iop is calculated based on the file file float cosines[6]; @@ -263,14 +581,14 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) it = fileList->begin(); it != fileList->end(); ++it ) { - if( first ) + if ( first ) { (*it)->GetImageOrientationPatient( cosines ); // You only have to do this once for all slices in the volume. Next, // for each slice, calculate the distance along the slice normal - // using the IPP tag ("dist" is initialized to zero before reading - // the first slice) : + // using the IPP ("Image Position Patient") tag. + // ("dist" is initialized to zero before reading the first slice) : normal[0] = cosines[1]*cosines[5] - cosines[2]*cosines[4]; normal[1] = cosines[2]*cosines[3] - cosines[0]*cosines[5]; normal[2] = cosines[0]*cosines[4] - cosines[1]*cosines[3]; @@ -319,11 +637,12 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) // gdcmAssertMacro( CoherentFileVector.capacity() >= n ); // Find out if min/max are coherent - if( min == max ) - { - gdcmWarningMacro( "Looks like all images have the exact same image position..."); + if ( min == max ) + { + gdcmWarningMacro("Looks like all images have the exact same image position" + << ". No PositionPatientOrdering sort performed" ); return false; - } + } float step = (max - min)/(n - 1); int pos; @@ -345,19 +664,33 @@ bool SerieHelper::ImagePositionPatientOrdering( FileList *fileList ) CoherentFileVector[pos] = *it2; else { - gdcmWarningMacro( "2 files same position"); + gdcmWarningMacro( "At least 2 files with same position." + << " No PositionPatientOrdering sort performed"); return false; } } - fileList->clear(); // doesn't delete list elements, only node - - //VC++ don't understand what scope is !! it -> it3 - for (FileVector::const_iterator it3 = CoherentFileVector.begin(); - it3 != CoherentFileVector.end(); ++it3) - { - fileList->push_back( *it3 ); + fileList->clear(); // doesn't delete list elements, only nodes + + if (DirectOrder) + { + //VC++ don't understand what scope is !! it -> it3 + for (FileVector::const_iterator it3 = CoherentFileVector.begin(); + it3 != CoherentFileVector.end(); ++it3) + { + fileList->push_back( *it3 ); + } } + else // user asked for reverse order + { + FileVector::const_iterator it4; + it4 = CoherentFileVector.end(); + do + { + it4--; + fileList->push_back( *it4 ); + } while (it4 != CoherentFileVector.begin() ); + } distlist.clear(); CoherentFileVector.clear(); @@ -370,13 +703,18 @@ bool SerieHelper::ImageNumberLessThan(File *file1, File *file2) return file1->GetImageNumber() < file2->GetImageNumber(); } +bool SerieHelper::ImageNumberGreaterThan(File *file1, File *file2) +{ + return file1->GetImageNumber() > file2->GetImageNumber(); +} + /** * \brief sorts the images, according to their Image Number * \note Works only on bona fide files (i.e image number is a character string * corresponding to an integer) * within a bona fide serie (i.e image numbers are consecutive) - * @param fileList Coherent File list (same Serie UID) to sort - * @return false if non nona fide stuff encountered + * @param fileList File set (same Serie UID) to sort + * @return false if non bona fide stuff encountered */ bool SerieHelper::ImageNumberOrdering(FileList *fileList) { @@ -394,19 +732,31 @@ bool SerieHelper::ImageNumberOrdering(FileList *fileList) } // Find out if image numbers are coherent (consecutive) - if( min == max || max == 0 || max >= (n+min)) + if ( min == max || max == 0 || max >= (n+min) ) + { + gdcmWarningMacro( " 'Image numbers' not coherent. " + << " No ImageNumberOrdering sort performed."); return false; - - std::sort(fileList->begin(), fileList->end(), SerieHelper::ImageNumberLessThan ); + } + if (DirectOrder) + std::sort(fileList->begin(), fileList->end(), + SerieHelper::ImageNumberLessThan ); + else + std::sort(fileList->begin(), fileList->end(), + SerieHelper::ImageNumberGreaterThan ); return true; } bool SerieHelper::FileNameLessThan(File *file1, File *file2) { - return file1->GetFileName() < file2->GetFileName(); + return file1->GetFileName() < file2->GetFileName(); } +bool SerieHelper::FileNameGreaterThan(File *file1, File *file2) +{ + return file1->GetFileName() > file2->GetFileName(); +} /** * \brief sorts the images, according to their File Name * @param fileList Coherent File list (same Serie UID) to sort @@ -414,7 +764,29 @@ bool SerieHelper::FileNameLessThan(File *file1, File *file2) */ bool SerieHelper::FileNameOrdering(FileList *fileList) { - std::sort(fileList->begin(), fileList->end(), SerieHelper::FileNameLessThan); + if (DirectOrder) + std::sort(fileList->begin(), fileList->end(), + SerieHelper::FileNameLessThan); + else + std::sort(fileList->begin(), fileList->end(), + SerieHelper::FileNameGreaterThan); + + return true; +} + +/** + * \brief sorts the images, according to user supplied function + * @param fileList Coherent File list (same Serie UID) to sort + * @return false only if the header is bugged ! + */ +bool SerieHelper::UserOrdering(FileList *fileList) +{ + std::sort(fileList->begin(), fileList->end(), + SerieHelper::UserLessThanFunction); + if (!DirectOrder) + { + std::reverse(fileList->begin(), fileList->end()); + } return true; } @@ -426,17 +798,17 @@ bool SerieHelper::FileNameOrdering(FileList *fileList) void SerieHelper::Print(std::ostream &os, std::string const &indent) { // For all the Coherent File lists of the gdcm::Serie - CoherentFileListmap::iterator itl = CoherentFileListHT.begin(); - if ( itl == CoherentFileListHT.end() ) + SingleSerieUIDFileSetmap::iterator itl = SingleSerieUIDFileSetHT.begin(); + if ( itl == SingleSerieUIDFileSetHT.end() ) { - gdcmWarningMacro( "No Coherent File list found" ); + gdcmWarningMacro( "No SingleSerieUID File set found" ); return; } - while (itl != CoherentFileListHT.end()) + while (itl != SingleSerieUIDFileSetHT.end()) { os << "Serie UID :[" << itl->first << "]" << std::endl; - // For all the files of a Coherent File list + // For all the files of a SingleSerieUID File set for (FileList::iterator it = (itl->second)->begin(); it != (itl->second)->end(); ++it)