X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmSerieHelper.h;h=6edc0effb6a28ccf5f6700bef50a8313f03537ab;hb=985954a7af00b467b183bb3f5db9dc11f89fcaf5;hp=45fcd4f42b2eff14e116ec89a68d639cdab8b046;hpb=262bd420b44791777972b1d574fe94827da54e03;p=gdcm.git

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 45fcd4f4..6edc0eff 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/02/02 15:12:09 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/02/11 17:01:46 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,11 +20,15 @@
 #define GDCMSERIEHELPER_H
 
 #include "gdcmCommon.h" 
-#include <list>
+
+#include <vector>
+#include <iostream>
 #include <map>
+
 namespace gdcm 
 {
 class File;
+typedef std::vector<File* > GdcmFileList;
 
 //-----------------------------------------------------------------------------
 /**
@@ -37,17 +41,17 @@ class File;
 class GDCM_EXPORT SerieHelper 
 {
 public:
-   typedef std::list<File* > GdcmFileList;
    typedef std::map<std::string, GdcmFileList *> CoherentFileListmap;
+   typedef std::vector<File* > GdcmFileVector;
 
-    SerieHelper();
-    ~SerieHelper();
- void Print();
+   SerieHelper();
+   ~SerieHelper();
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
    /// \todo should return bool or throw error ?
    void AddFileName(std::string const &filename);
    void SetDirectory(std::string const &dir, bool recursive=false);
-   void OrderGdcmFileList(GdcmFileList *CoherentGdcmFileList);
+   void OrderGdcmFileList(GdcmFileList *coherentGdcmFileList);
    
    /// \brief Gets the FIRST *coherent* File List.
    ///        Deprecated; kept not to break the API
@@ -58,13 +62,15 @@ public:
   
    GdcmFileList *GetFirstCoherentFileList();
    GdcmFileList *GetNextCoherentFileList();
-   GdcmFileList *GetCoherentFileList(std::string SerieUID);
+   GdcmFileList *GetCoherentFileList(std::string serieUID);
 
 private:
-   bool ImagePositionPatientOrdering(GdcmFileList *CoherentGdcmFileList);
-   bool ImageNumberOrdering(GdcmFileList *CoherentGdcmFileList);
-   bool FileNameOrdering(GdcmFileList *CoherentGdcmFileList);
+   bool ImagePositionPatientOrdering(GdcmFileList *coherentGdcmFileList);
+   bool ImageNumberOrdering(GdcmFileList *coherentGdcmFileList);
+   bool FileNameOrdering(GdcmFileList *coherentGdcmFileList);
    
+   static bool ImageNumberLessThan(File *file1, File *file2);
+   static bool FileNameLessThan(File *file1, File *file2);
    CoherentFileListmap CoherentGdcmFileListHT;
    CoherentFileListmap::iterator ItListHt;
 };