Some normalizations :

[gdcm.git] / src / gdcmDirList.h

diff --git a/src/gdcmDirList.h b/src/gdcmDirList.h
index 4e112d07b5931a8ca16f03d967f4df7e7dc568d7..6f1f234e836d76b0c9f4e4b0fbd2641ad096d024 100644 (file)
--- a/src/gdcmDirList.h
+++ b/src/gdcmDirList.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/16 14:34:12 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2005/01/23 10:12: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
@@ -22,36 +22,46 @@
 #include "gdcmCommon.h"
 
 #include <string>
-#include <list>
+#include <vector>
+#include <iostream>
+
 namespace gdcm 
 {
 
+typedef std::vector<std::string> DirListType;
+
 //-----------------------------------------------------------------------------
+
+// NOTE: Due to a VC6 'feature' we can not export a std::list in a dll, 
+// so GDCM_EXPORT keyword was removed for this class only
+
 /**
  * \ingroup DirList
- * \brief   List containing the file headers from root directory. 
+ * \brief   List containing the file Header s of all the gdcm readable files
+ *          found by exploring recursively a root directory. 
  */
-// NOTE: Due to a VC6 'feature' we can not export a std::list in a dll, 
-// so GDCM_EXPORT keyword was removed for this class only
-class DirList: public std::list<std::string>
+class GDCM_EXPORT DirList
 {
 public :
-   DirList(std::string dirName,bool recursive=false);
-   virtual ~DirList();
+   DirList(std::string const &dirName, bool recursive=false);
+   ~DirList();
+
+   /// Return the name of the directory
+   std::string const &GetDirName() const { return DirName; }
 
-   std::string GetDirName();
+   /// Return the file names
+   DirListType const &GetFilenames() const { return Filenames; };
 
-   /// Character '\' 
-   static const char SEPARATOR_X;
-   /// Character '/'  
-   static const char SEPARATOR_WIN;
-   /// depending on the O.S.
-   static const std::string SEPARATOR;
+   /// Print all element of the DirList
+   void Print(std::ostream &os = std::cout);
 
 private :
-   int Explore(std::string dirName,bool recursive=false);
+   int Explore(std::string const &dirName, bool recursive=false);
+
+   DirListType Filenames;
+
    /// name of the root directory to explore
-   std::string name;
+   std::string DirName;
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------