X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdFilesFromDirectory.cxx;h=6712c8cca4230ee8a6008098204ff4d8d099d93c;hb=81cf34a7ea4edd0cef61258e6d65df60e80bbb6a;hp=61fb34c9c5a4e6a2b4bd93446c9367faa5a7e6d7;hpb=5ef20de28d80f6a2e34321fa000cf02914029365;p=bbtk.git

diff --git a/packages/std/src/bbstdFilesFromDirectory.cxx b/packages/std/src/bbstdFilesFromDirectory.cxx
index 61fb34c..6712c8c 100644
--- a/packages/std/src/bbstdFilesFromDirectory.cxx
+++ b/packages/std/src/bbstdFilesFromDirectory.cxx
@@ -269,12 +269,39 @@ void FilesFromDirectory::CleanFilenames( std::string basePath )
 {
   	std::string tmpString;
   	int i,ii,sizeFilenames = Filenames.size();
+	int j,sizeFileEnd = bbGetInputFileEnd().size();
 
+	int okEraseElement;
+	
+//Selecting just the files in the FileEnd List
+	if (bbGetInputFileEnd().size()!=0)
+	{
+		for (i=sizeFilenames-1; i>=0; i--)
+		{
+			okEraseElement=0;
+			for (j=0; j<sizeFileEnd; j++)
+			{
+				std::string tmp=Filenames[i].substr( (Filenames[i].length()) - (bbGetInputFileEnd()[j]).length() ) ;
+				if (bbGetInputFileEnd()[j].compare( tmp )==0 )
+				{
+					okEraseElement++;
+				} // if FileEnd
+			} // for j					
+
+			if (okEraseElement==0) 
+			{ 
+				Filenames.erase( Filenames.begin()+i );
+			}
+		} // for i	
+	} // if FileEnd !=0
+
+	sizeFilenames = Filenames.size();
 
 // Cleanning paths with spaces	
 	for (i=0; i<sizeFilenames; i++)
 	{
 		tmpString=Filenames[i];
+
 		std::string::size_type  spacePosition = tmpString.find_first_of(' ');
 		if (spacePosition != std::string::npos)
 		{
@@ -286,6 +313,7 @@ void FilesFromDirectory::CleanFilenames( std::string basePath )
 		} // if spacePosition
 	}
 
+
 // Alphabetical order	
   	for (i=0; i<sizeFilenames; i++)
   	{
@@ -304,7 +332,6 @@ void FilesFromDirectory::CleanFilenames( std::string basePath )
 	unsigned int lenghtBasePath = basePath.length();
 	for (i=0; i<sizeFilenames; i++)
 	{
-
 		SimpleFilenames.push_back( Filenames[i].substr( lenghtBasePath ) );
 	} // for i