X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdFilesFromDirectory.h;h=7d67556986c869538d1c584ec27d0978c9269345;hb=899e84df04040566381e7252faa0b47d0863baca;hp=10ec9b226b5859ddfc23a3ce35da3f931db7ba54;hpb=9ec0d27e7a99329b32311fa693dca4a389b89833;p=bbtk.git

diff --git a/packages/std/src/bbstdFilesFromDirectory.h b/packages/std/src/bbstdFilesFromDirectory.h
index 10ec9b2..7d67556 100644
--- a/packages/std/src/bbstdFilesFromDirectory.h
+++ b/packages/std/src/bbstdFilesFromDirectory.h
@@ -1,52 +1,81 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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"
 #include "iostream"
+#include "bbstd_EXPORT.h"
 
 namespace bbstd
 {
 
-class /*BBTK_EXPORT*/ FilesFromDirectory
- : 
-   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_OUTPUT(Out,std::vector<std::string>);
-  BBTK_PROCESS(Process);
-  void Process();
-  
+  class bbstd_EXPORT FilesFromDirectory
+    : 
+    public bbtk::AtomicBlackBox
+  {
+    BBTK_BLACK_BOX_INTERFACE(FilesFromDirectory,bbtk::AtomicBlackBox);
+    BBTK_DECLARE_INPUT(In,std::string);
+    BBTK_DECLARE_INPUT(Recursive,bool);  
+    BBTK_DECLARE_INPUT(Type,int);  
+    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);
+    std::string NormalizePath(std::string const &pathname);
+    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;
+  };
   
-  /// List of file names
-  std::vector<std::string> Filenames;
-  /// name of the root directory to explore
-  std::string DirName;
-};
-
-//=================================================================
-// UserBlackBox 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_OUTPUT(FilesFromDirectory,Out,"FullPathNames of the files",std::vector<std::string>,"");
-BBTK_END_DESCRIBE_BLACK_BOX(FilesFromDirectory);
+  //=================================================================
+  // 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_INPUT(FilesFromDirectory,Type,"0=files 1=All_directories 2=last_directories  (0 default)",int,"");
+  
+   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);
+
 }
 // EO namespace bbstd