X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.cxx;h=c049e8b45c4807550742db86d83746835c17330b;hb=c51e8fb561dad6c912762907f5107dba5f72afc8;hp=1c18682fc4cced98ed046e8633db7705f434bdb7;hpb=02e5b298070faff881e584dd818d85bfc05e92bf;p=gdcm.git

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index 1c18682f..c049e8b4 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/08/30 08:12:40 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2005/08/31 16:24:19 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,6 +29,7 @@
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -228,6 +229,10 @@ void SerieHelper::AddGdcmFile(File *header)
  * 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   group  Group number of the target tag.
+ * @param   elem Element number of the target tag.
+ * @param value value to be checked to exclude File
+ * @param op  operator we want to use to check
  */
 void SerieHelper::AddRestriction(uint16_t group, uint16_t elem, 
                                  std::string const &value, int op)
@@ -247,6 +252,9 @@ void SerieHelper::AddRestriction(uint16_t group, uint16_t elem,
  * 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   group  Group number of the target tag.
+ * @param   elem Element number of the target tag.
+ * @param value value to be checked to exclude File 
  * @deprecated use : AddRestriction(uint16_t group, uint16_t elem, 
  *                                 std::string const &value, int op);
  */
@@ -570,12 +578,12 @@ bool SerieHelper::ImageNumberOrdering(FileList *fileList)
 
 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();
+   return file1->GetFileName() > file2->GetFileName();
 }
 /**
  * \brief sorts the images, according to their File Name
@@ -594,19 +602,19 @@ bool SerieHelper::FileNameOrdering(FileList *fileList)
 
 /**
  * \brief sorts the images, according to user supplied function
- * \note Only Direct ordering is allowed
  * @param fileList Coherent File list (same Serie UID) to sort
  * @return false only if the header is bugged !
  */
 bool SerieHelper::UserOrdering(FileList *fileList)
 {
-   if (DirectOrder) 
-      std::sort(fileList->begin(), fileList->end(), SerieHelper::UserLessThanFunction);
-   else
-      gdcmWarningMacro( " Only Direct ordering allowed "
-                     << "when user function is supplied");
+   std::sort(fileList->begin(), fileList->end(), SerieHelper::UserLessThanFunction);
+   if (!DirectOrder) 
+   {
+      std::reverse(fileList->begin(), fileList->end());
+   }
    return true;
 }
+
 //-----------------------------------------------------------------------------
 // Print
 /**