From bfede4f2084492a14d5d7c68f7d1a60d91865236 Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Tue, 24 Feb 2009 21:36:09 +0000
Subject: [PATCH] *** empty log message ***

---
 appli/gimmick/main.cxx                    |  4 +-
 src2/creaImageIOTreeHandlerImageAdder.cpp | 49 +++++++++++++++++++----
 src2/creaImageIOTreeHandlerImageAdder.h   | 14 +++++++
 src2/creaImageIOVtkImageReader.cpp        |  5 ++-
 4 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/appli/gimmick/main.cxx b/appli/gimmick/main.cxx
index a39b1e2..397a4f9 100644
--- a/appli/gimmick/main.cxx
+++ b/appli/gimmick/main.cxx
@@ -5,7 +5,7 @@
 int main(int argc, char* argv[])
 {
   gengetopt_args_info args;
-  if (cmdline_parser (argc, argv, &args) != 0) exit(1) ;
+  if (cmdline_parser (argc, argv, &args) != 0) return 0 ;
      
   creaImageIO::Gimmick g;
   if (args.verbose_given) g.SetMessageLevel(args.verbose_arg);
@@ -19,7 +19,7 @@ int main(int argc, char* argv[])
   if (!something_to_do)
     {
       std::cout << "Nothing to do !" << std::endl;
-      exit(0);
+      return 0;
     }
 
   std::string handler("Local database");
diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp
index 057f16e..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
 {
@@ -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);
 	  }
       }
-    
-  }
+  
+  */
+  
   //=======================================================================
 
 
diff --git a/src2/creaImageIOTreeHandlerImageAdder.h b/src2/creaImageIOTreeHandlerImageAdder.h
index 4815853..72ae350 100644
--- a/src2/creaImageIOTreeHandlerImageAdder.h
+++ b/src2/creaImageIOTreeHandlerImageAdder.h
@@ -123,8 +123,22 @@ namespace creaImageIO
   //=======================================================================
 
 
+ 
+
+
 } // EO namespace creaImageIO
 
+#include <iostream>
+inline std::ostream& operator << ( std::ostream& o, 
+			    const creaImageIO::TreeHandlerImageAdder::Progress& p)
+{
+  o << p.GetNumberScannedFiles() << " files - "
+    << p.GetNumberScannedDirs() << " dirs - "
+    << p.GetNumberHandledFiles() << " handled -"
+    << p.GetNumberAddedFiles() << " added";
+  return o;
+}
+
 // EOF
 #endif  
 
diff --git a/src2/creaImageIOVtkImageReader.cpp b/src2/creaImageIOVtkImageReader.cpp
index 90a83eb..66f7059 100644
--- a/src2/creaImageIOVtkImageReader.cpp
+++ b/src2/creaImageIOVtkImageReader.cpp
@@ -20,7 +20,8 @@ namespace creaImageIO
       {
 	SetName ( name );
       }
-
+    GimmickDebugMessage(5,"Constructing vtkImageReader : "<<GetName()
+			<<std::endl);
       
   }
   //=====================================================================
@@ -28,6 +29,8 @@ namespace creaImageIO
   //=====================================================================
   VtkImageReader::~VtkImageReader()
   {
+    GimmickDebugMessage(5,"Destructing vtkImageReader : "<<GetName()
+			<<std::endl);
     mReader->Delete();
   }
   //=====================================================================
-- 
2.45.1