X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeHandlerImageAdder.cpp;h=057f16eb51e994563a107e3d0f7bfd374c17ba37;hb=86c8c6b0f5c28056b5d3ea1281cc244279ccb06b;hp=ebfd2c594412a353fbcd025292497e1fa1168b3f;hpb=f1caae70392f96f30dd90eb073be6be10fbf1caa;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp
index ebfd2c5..057f16e 100644
--- a/src2/creaImageIOTreeHandlerImageAdder.cpp
+++ b/src2/creaImageIOTreeHandlerImageAdder.cpp
@@ -29,7 +29,7 @@ namespace creaImageIO
   //=====================================================================
   bool TreeHandlerImageAdder::IsHandledFile( const std::string& filename)
   {
-    return (mReader.CanRead(filename,""));
+    return (mReader.CanRead(filename));
   }
   //=====================================================================
 
@@ -47,24 +47,9 @@ namespace creaImageIO
 	  {
 	    mProgress.IncNumberHandledFiles();
 	    AddFile(*i);
-
-
-	    /*
-	    if (progress)
-	      {
-		std::string mess("Adding ");
-		mess += *i;
-		if (!progress->Update( (int)(summary.added_images*999./nbf),
-				       std2wx(mess)))
-		  {
-		    // Some file was added hence we must return true !
-		    summary.cancelled_by_user = true;
-		    break;
-		  }
-	      }
-	    */
 	  }
 	mProgressSignal(mProgress);
+	if (mProgress.GetStop()) break;
       }
   }
   //=====================================================================
@@ -102,16 +87,8 @@ namespace creaImageIO
   void TreeHandlerImageAdder::AddDirectoryRecursor(const std::string &dirpath, 
 						   bool recursive)
   {
-    //    std::cout << "dir : "<<dirpath << std::endl;
-   mProgress.IncNumberScannedDirs();
-    /*
-    if (progress) 
-      {
-	std::string mess("Parsing ");
-	mess += dirpath;
-	progress->Pulse(std2wx(mess));
-      }
-    */    
+    mProgress.IncNumberScannedDirs();
+
     std::string fileName;
     std::string dirName = dirpath;
 
@@ -134,31 +111,24 @@ namespace creaImageIO
 
 	wxFileName wxffn(dir.GetName(),filename);
 	std::string ffn = wx2std(wxffn.GetFullPath());
-	//	std::cout << "file : "<<ffn << std::endl;
 	if (IsHandledFile(ffn)) 
 	  {
 	    mProgress.IncNumberHandledFiles();
-	    //	    std::cout << "handled : "<<ffn << std::endl;
 	    AddFile( ffn );
 	  }
-	//	std::cout << "signal " << std::endl;
 	mProgressSignal(mProgress);
-	//	std::cout << "cont " << std::endl;
 	cont = ( dir.GetNext(&filename) && (!mProgress.GetStop()) );
-	//	std::cout << "next" << std::endl;
       }
     
     // Recurse into subdirs
     if ( recursive )
       {
-	//	std::cout << "recurse " << std::endl;
 	cont = dir.GetFirst(&filename, wxEmptyString, 
 			    wxDIR_DIRS | wxDIR_HIDDEN );
 	while ( cont )
 	  {
 	    wxFileName wxffn(dir.GetName(),filename);
 	    std::string ffn = wx2std(wxffn.GetFullPath());
-	    //	    std::cout << "goto "<<ffn << std::endl;
 	    AddDirectoryRecursor( ffn, recursive);
 	    cont = dir.GetNext(&filename);
 	  }