X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.h;h=7299f89abca458d66d80bd719ae2e59de6adfe3e;hb=76ac46b16fd92d0fb444f786d4946424d9029315;hp=de3576664a5a896d14a1ab423e332cba38bc19ed;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git

diff --git a/src/gdcmDirList.h b/src/gdcmDirList.h
index de357666..7299f89a 100644
--- a/src/gdcmDirList.h
+++ b/src/gdcmDirList.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.7 $
+  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
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -16,39 +16,68 @@
                                                                                 
 =========================================================================*/
 
-#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_NAME_SPACE
+{
+
+typedef std::vector<std::string> DirListType;
 
 //-----------------------------------------------------------------------------
+
+// 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() 
+
 /**
- * \ingroup gdcmDirList
- * \brief   List containing the file headers from root directory. 
+ * \brief   List containing the file headers of all the 'gdcm readable' files
+ *          found by exploring (possibly recursively) a root directory. 
  */
-class GDCM_EXPORT gdcmDirList: public std::list<std::string>
+class GDCM_EXPORT DirList : public Base
 {
 public :
-   gdcmDirList(std::string dirName,bool recursive=false);
-   virtual ~gdcmDirList(void);
+   DirList(std::string const &dirName, bool recursive, bool all=false);
+   DirList(DicomDirSerie *s);   
+   ~DirList();
+
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
-   std::string GetDirName(void);
+   /// Return the name of the directory
+   std::string const &GetDirName() const { return DirName; }
 
-   /// Character '\' 
-   static const char SEPARATOR_X;
-   /// Character '/'  
-   static const char SEPARATOR_WIN;
-   /// depending on the O.S.
-   static const std::string SEPARATOR;
+   /// 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 :
-   void Explore(std::string dirName,bool recursive=false);
+   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 name;
+   std::string DirName;
+   
+   /// iterator on the SQItems of the current SeqEntry
+   DirListType::iterator ItDirList;  
+   
 };
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif