From: jpr <jpr>
Date: Wed, 18 Jan 2006 15:25:07 +0000 (+0000)
Subject: To please M$VC6 :
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3a0c4256baa5052f854ac46751b93a3e0d0e5f7a;p=gdcm.git

To please M$VC6 :
Doesn't understand syntax as follow :
       std::sort(fileList->begin(), fileList->end(),
                                          SerieHelper::ImageNumberLessThan )
Add a method like:
Sort(fileList,SerieHelper::ImageNumberLessThan);
---

diff --git a/src/gdcmCommandManager.h b/src/gdcmCommandManager.h
index cd7244f8..9d964109 100644
--- a/src/gdcmCommandManager.h
+++ b/src/gdcmCommandManager.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommandManager.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 16:31:22 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2006/01/18 15:25:07 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -52,9 +52,10 @@ public:
 
    static const CommandManager *GetInstance();
 
+   ~CommandManager();
+
 protected:
    CommandManager();
-   ~CommandManager();
 
    void InClearCommand(void);
    void InSetCommand(const Base *object,unsigned int type,Command *command);
diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index 164023ed..3761252f 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/12/21 14:48:09 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2006/01/18 15:25:07 $
+  Version:   $Revision: 1.42 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -768,11 +768,13 @@ bool SerieHelper::ImageNumberOrdering(FileList *fileList)
       return false;
    }
    if (DirectOrder) 
-      std::sort(fileList->begin(), fileList->end(), 
-                                          SerieHelper::ImageNumberLessThan );
+        Sort(fileList,SerieHelper::ImageNumberLessThan);
+//      std::sort(fileList->begin(), fileList->end(), 
+//                                          SerieHelper::ImageNumberLessThan );
    else
-      std::sort(fileList->begin(), fileList->end(),
-                                          SerieHelper::ImageNumberGreaterThan );
+        Sort(fileList,SerieHelper::ImageNumberGreaterThan);
+//      std::sort(fileList->begin(), fileList->end(),
+//                                          SerieHelper::ImageNumberGreaterThan );
 
    return true;
 }
@@ -794,11 +796,13 @@ bool SerieHelper::FileNameGreaterThan(File *file1, File *file2)
 bool SerieHelper::FileNameOrdering(FileList *fileList)
 {
    if (DirectOrder) 
-      std::sort(fileList->begin(), fileList->end(), 
-                                       SerieHelper::FileNameLessThan);
+        Sort(fileList,SerieHelper::FileNameLessThan);
+//      std::sort(fileList->begin(), fileList->end(), 
+//                                       SerieHelper::FileNameLessThan);
    else
-      std::sort(fileList->begin(), fileList->end(), 
-                                       SerieHelper::FileNameGreaterThan);
+        Sort(fileList,SerieHelper::FileNameGreaterThan);   
+//      std::sort(fileList->begin(), fileList->end(), 
+//                                       SerieHelper::FileNameGreaterThan);
 
    return true;
 }
@@ -810,8 +814,9 @@ bool SerieHelper::FileNameOrdering(FileList *fileList)
  */
 bool SerieHelper::UserOrdering(FileList *fileList)
 {
-   std::sort(fileList->begin(), fileList->end(), 
-                                             SerieHelper::UserLessThanFunction);
+        Sort(fileList,SerieHelper::UserLessThanFunction);   
+//   std::sort(fileList->begin(), fileList->end(), 
+//                                             SerieHelper::UserLessThanFunction);
    if (!DirectOrder) 
    {
       std::reverse(fileList->begin(), fileList->end());
@@ -1026,5 +1031,15 @@ void SerieHelper::Print(std::ostream &os, std::string const &indent)
    }
 }
 
+//-----------------------------------------------------------------------------
+// Sort
+/**
+ * \brief   Sort FileList.
+ */
+void SerieHelper::Sort(FileList *fileList, bool (*pt2Func)( File *file1, File *file2) )
+{
+ std::sort(fileList->begin(), fileList->end(), pt2Func );
+}
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm
diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 5781546c..1b9a8ff8 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/12/21 14:48:09 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2006/01/18 15:25:07 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -203,6 +203,7 @@ private:
    ///        he may supply his own comparison function.
     BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction;
 
+    void Sort(FileList *fileList, bool (*pt2Func)( File *file1, File *file2) );
 };
 
 } // end namespace gdcm