X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdFilesFromDirectory.h;h=841df20a83f8bf8ecc9fb570282d883975bf7c1d;hb=2dd2633fa3c6c6861a6ce62f1055d867bed534de;hp=2d49d33d208813a7f563c2eed9546b545555ea0a;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/std/src/bbstdFilesFromDirectory.h b/packages/std/src/bbstdFilesFromDirectory.h
index 2d49d33..841df20 100644
--- a/packages/std/src/bbstdFilesFromDirectory.h
+++ b/packages/std/src/bbstdFilesFromDirectory.h
@@ -41,16 +41,22 @@ namespace bbstd
     BBTK_BLACK_BOX_INTERFACE(FilesFromDirectory,bbtk::AtomicBlackBox);
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_INPUT(Recursive,bool);  
+    BBTK_DECLARE_INPUT(RecursiveLevel,int);  
+    BBTK_DECLARE_INPUT(Type,int);  
+    BBTK_DECLARE_INPUT(FileEnd,std::vector<std::string>);  
     BBTK_DECLARE_OUTPUT(Out,std::vector<std::string>);
+    BBTK_DECLARE_OUTPUT(OutSimple,std::vector<std::string>);
     BBTK_PROCESS(Process);
     void Process();
     
   private :
     std::string NormalizePath(std::string const &pathname);
-    int Explore(std::string const &dirpath, bool recursive);
-    
+    int 	Explore(std::string const &dirpath, bool recursive, int recursiveLevel);
+    void 	CleanFilenames( std::string basePath );
+
     /// List of file names
     std::vector<std::string> Filenames;
+    std::vector<std::string> SimpleFilenames;
     /// name of the root directory to explore
     std::string DirName;
   };
@@ -58,14 +64,20 @@ namespace bbstd
   //=================================================================
   // BlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(FilesFromDirectory,bbtk::AtomicBlackBox);
-  BBTK_NAME("FilesFromDirectory");
-  BBTK_AUTHOR("jpr@creatis.univ-lyon1.fr");
-  BBTK_DESCRIPTION("returns the fullPathNames of the files in a Directory");
-  BBTK_CATEGORY("");
-  BBTK_INPUT(FilesFromDirectory,In,"Directory Name",std::string,"");
-  BBTK_INPUT(FilesFromDirectory,Recursive,"Recursive directory exploration",bool,"");
+   BBTK_NAME("FilesFromDirectory");
+   BBTK_AUTHOR("jpr@creatis.univ-lyon1.fr");
+   BBTK_DESCRIPTION("returns the fullPathNames of the files in a Directory");
+   BBTK_CATEGORY("");
+
+   BBTK_INPUT(FilesFromDirectory,In,"Directory Name",std::string,"");
+   BBTK_INPUT(FilesFromDirectory,Recursive,"(default false) Recursive directory exploration",bool,"");
+   BBTK_INPUT(FilesFromDirectory,Type,"(0 default) 0=files 1=All_directories 2=last_directories  ",int,"");
+   BBTK_INPUT(FilesFromDirectory,RecursiveLevel,"(999 default) Recursive level",int,"");
+   BBTK_INPUT(FilesFromDirectory,FileEnd,"Select just the files with this end file name",std::vector<std::string>,"");
   
-  BBTK_OUTPUT(FilesFromDirectory,Out,"FullPathNames of the files",std::vector<std::string>,"");
+   BBTK_OUTPUT(FilesFromDirectory,Out,"FullPathNames of the files",std::vector<std::string>,"");
+   BBTK_OUTPUT(FilesFromDirectory,OutSimple,"Simple Full PathNames of the files",std::vector<std::string>,"");
+
   BBTK_END_DESCRIBE_BLACK_BOX(FilesFromDirectory);
 
 }