X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdFilesFromDirectory.h;h=852e83b529ac9c603daa477c6d5eb9e4d9c51b07;hb=81cf34a7ea4edd0cef61258e6d65df60e80bbb6a;hp=125909ba62a6373c58adf652d3ddde351af42092;hpb=c429a5e1229f3dbc56e2d0100980c7e4a3506d89;p=bbtk.git

diff --git a/packages/std/src/bbstdFilesFromDirectory.h b/packages/std/src/bbstdFilesFromDirectory.h
index 125909b..852e83b 100644
--- a/packages/std/src/bbstdFilesFromDirectory.h
+++ b/packages/std/src/bbstdFilesFromDirectory.h
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
 #ifndef __bbstdFilesFromDirectory_h_INCLUDED__
 #define __bbstdFilesFromDirectory_h_INCLUDED__
 #include "bbtkAtomicBlackBox.h"
@@ -12,26 +39,23 @@ namespace bbstd
     public bbtk::AtomicBlackBox
   {
     BBTK_BLACK_BOX_INTERFACE(FilesFromDirectory,bbtk::AtomicBlackBox);
-    //==================================================================
-    /// User callback called in the box contructor
-    virtual void bbUserConstructor();
-    /// User callback called in the box copy constructor
-    virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-    /// User callback called in the box destructor
-    virtual void bbUserDestructor();
-    //==================================================================
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_INPUT(Recursive,bool);  
+    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);
+    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;
   };
@@ -39,14 +63,19 @@ 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,"Recursive directory exploration",bool,"");
+   BBTK_INPUT(FilesFromDirectory,Type,"0=files 1=All_directories 2=last_directories  (0 default)",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);
 
 }