Fix mistypings

[gdcm.git] / src / gdcmDirList.h

diff --git a/src/gdcmDirList.h b/src/gdcmDirList.h
index 526f94acb9bb5833b68231cf68b262dc59d4f0d0..7299f89abca458d66d80bd719ae2e59de6adfe3e 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: 2005/01/12 22:09:55 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2009/02/05 09:03:26 $
+  Version:   $Revision: 1.37 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,46 +16,67 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDIRLIST_H
-#define GDCMDIRLIST_H
+#ifndef _GDCMDIRLIST_H_
+#define _GDCMDIRLIST_H_
 
-#include "gdcmCommon.h"
+#include "gdcmBase.h"
+#include "gdcmDicomDirSerie.h"
 
 #include <string>
-#include <list>
+#include <vector>
+#include <iostream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE
 {
 
+typedef std::vector<std::string> DirListType;
+
 //-----------------------------------------------------------------------------
-/**
- * \ingroup DirList
- * \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, 
+
+// NOTE: Due to a M$VC6 'feature' we cannot export a std::list in a dll, 
 // so GDCM_EXPORT keyword was removed for this class only
+//
+// We have to supply accessors GetSize(), GetFirst(), GetNext() 
 
-class DirList: public std::list<std::string>
+/**
+ * \brief   List containing the file headers of all the 'gdcm readable' files
+ *          found by exploring (possibly recursively) a root directory. 
+ */
+class GDCM_EXPORT DirList : public Base
 {
 public :
-   DirList(std::string const &dirName, bool recursive=false);
-   virtual ~DirList();
+   DirList(std::string const &dirName, bool recursive, bool all=false);
+   DirList(DicomDirSerie *s);   
+   ~DirList();
 
-   std::string const &GetDirName() const;
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
-   /// Character '\' 
-   static const char SEPARATOR_X;
-   /// Character '/'  
-   static const char SEPARATOR_WIN;
-   /// depending on the O.S.
-   static const std::string SEPARATOR;
+   /// Return the name of the directory
+   std::string const &GetDirName() const { return DirName; }
 
-private :
-   int Explore(std::string const &dirName, bool recursive=false);
+   /// Return the file names
+   DirListType const &GetFilenames() const { return Filenames; }
+   
+    /// Return the number of Files
+   int GetSize() const { return Filenames.size(); }  
 
+   static bool IsDirectory(std::string const &dirName);
+   
+   std::string GetFirst();
+   std::string GetNext();
+   
+private :
+   int Explore(std::string const &dirName, bool recursive=false, bool all=false);
+   int Explore(DicomDirSerie *s);
+   
+   /// List of file names
+   DirListType Filenames;
    /// name of the root directory to explore
    std::string DirName;
+   
+   /// iterator on the SQItems of the current SeqEntry
+   DirListType::iterator ItDirList;  
+   
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------