X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeHandlerImageAdder.cpp;h=e384e99c7f3c1b674f939b80f668f3e87aaa7c34;hb=f5b34bdab9bf9fb39cbdf650949dac307e470606;hp=3f9d4aa8d32cb2512852cefeef2161d20b80e6f5;hpb=f2585049438c3630362b07e6029ddb0130a03818;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp
index 3f9d4aa..e384e99 100644
--- a/src2/creaImageIOTreeHandlerImageAdder.cpp
+++ b/src2/creaImageIOTreeHandlerImageAdder.cpp
@@ -1,9 +1,13 @@
 #include <creaImageIOTreeHandlerImageAdder.h>
-#include <creaWx.h>
-#include <wx/dir.h>
-#include <wx/filename.h>
+#include <creaImageIOSystem.h>
+//#include <wx/dir.h>
+//#include <wx/filename.h>
 
-using namespace crea;
+#include "boost/filesystem.hpp"
+
+namespace fs = boost::filesystem;
+
+//using namespace crea;
 
 namespace creaImageIO
 {
@@ -29,7 +33,7 @@ namespace creaImageIO
   //=====================================================================
   bool TreeHandlerImageAdder::IsHandledFile( const std::string& filename)
   {
-    return (mReader.CanRead(filename,""));
+    return (mReader.CanRead(filename));
   }
   //=====================================================================
 
@@ -60,6 +64,7 @@ namespace creaImageIO
   {
     mProgress.Reset();
     AddDirectoryRecursor( directory, recurse );
+    GimmickDebugMessage(3,mProgress<<std::endl);
   }
   //=====================================================================
 
@@ -69,7 +74,7 @@ namespace creaImageIO
   //=====================================================================
   void TreeHandlerImageAdder::AddFile( const std::string& filename )
   {
-    
+    GimmickDebugMessage(4,"Adding '"<<filename<<"'"<<std::endl);
     std::map< std::string, std::string>  attr;
     mTreeHandler->GetTree().GetDescriptor().BuildAttributeMap(attr);
 
@@ -87,8 +92,37 @@ namespace creaImageIO
   void TreeHandlerImageAdder::AddDirectoryRecursor(const std::string &dirpath, 
 						   bool recursive)
   {
+    GimmickDebugMessage(4,"Scanning '"<<dirpath<<"'"<<std::endl);
     mProgress.IncNumberScannedDirs();
 
+    if ( !fs::exists( dirpath ) ) return;
+    
+    fs::directory_iterator end_itr; // default construction yields past-the-end
+    for ( fs::directory_iterator itr( dirpath );
+	  itr != end_itr;
+	  ++itr )
+      {
+	// If is directory & recurse : do recurse
+	if ( fs::is_directory(itr->status()) )
+	  {
+	    if (recursive) AddDirectoryRecursor( itr->string(), recursive);
+	  }
+	else 
+	  {
+	    mProgress.IncNumberScannedFiles();
+	    if (IsHandledFile(itr->string()))
+	      {
+		mProgress.IncNumberHandledFiles();
+		AddFile( itr->string() );
+	      }
+	    mProgressSignal(mProgress);
+	    if (mProgress.GetStop()) break;
+	  }
+      }
+  }
+
+    /*
+
     std::string fileName;
     std::string dirName = dirpath;
 
@@ -133,8 +167,9 @@ namespace creaImageIO
 	    cont = dir.GetNext(&filename);
 	  }
       }
-    
-  }
+  
+  */
+  
   //=======================================================================