X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.h;h=d791fe13f4cddeb6fac302b3aaef64c20d50e4ea;hb=5eaf401931c8671af4f8189c4a50f58e6bdd67ed;hp=6921df6ad927e781ee40116d06ceda4ffc56a826;hpb=a08cf53dc69fa5e4b9e2dd4fbbfc3d476b963aa0;p=gdcm.git

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 6921df6a..d791fe13 100644
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/30 18:13:24 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2005/08/30 14:40:33 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,6 +31,8 @@ namespace gdcm
 class File;
 typedef std::vector<File* > FileList;
 
+typedef bool (*BOOL_FUNCTION_PFILE_PFILE_POINTER)(File *, File *);
+
 //-----------------------------------------------------------------------------
 /**
  * \brief  
@@ -75,8 +77,13 @@ public:
   
 /**
  * \brief Sets the LoadMode as a boolean string. 
- *        NO_SEQ, NO_SHADOW, NO_SHADOWSEQ
+<<<<<<< gdcmSerieHelper.h
+ *        LD_NOSEQ, LD_NOSHADOW, LD_NOSHADOWSEQ
  ... (nothing more, right now)
+=======
+ *        NO_SEQ, NO_SHADOW, NO_SHADOWSEQ
+ *        (nothing more, right now)
+>>>>>>> 1.17
  *        WARNING : before using NO_SHADOW, be sure *all* your files
  *        contain accurate values in the 0x0000 element (if any) 
  *        of *each* Shadow Group. The parser will fail if the size is wrong !
@@ -90,7 +97,11 @@ public:
 /// Brief User wants the files to be sorted Reverse Order 
    void SetSortOrderToReverse() { DirectOrder = false; }
 
+   /// to allow user to give is own comparison function
+   void SetUserLessThanFunction( BOOL_FUNCTION_PFILE_PFILE_POINTER userFunc ) 
+                        { UserLessThanFunction = userFunc; }   
 private:
+   bool UserOrdering(FileList *coherentFileList);
    bool ImagePositionPatientOrdering(FileList *coherentFileList);
    bool ImageNumberOrdering(FileList *coherentFileList);
    bool FileNameOrdering(FileList *coherentFileList);
@@ -127,6 +138,11 @@ private:
    /// \brief whether we want to sort in direct order or not (reverse order).
    ///        To be used by aware user only
    bool DirectOrder;
+
+   /// \brief If user knows more about his images than gdcm does,
+   ///        he may supply his own comparison function.
+    BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction;
+
 };
 
 } // end namespace gdcm