X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeHandlerImageAdder.h;h=e490509100a1469e2837639ae6f42f29a06c6646;hb=d1635bf73accf21c07f6315ed04609d703250269;hp=4d753d77c74eb72d07e4570f738d77f0344b4b99;hpb=f1caae70392f96f30dd90eb073be6be10fbf1caa;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeHandlerImageAdder.h b/src2/creaImageIOTreeHandlerImageAdder.h
index 4d753d7..e490509 100644
--- a/src2/creaImageIOTreeHandlerImageAdder.h
+++ b/src2/creaImageIOTreeHandlerImageAdder.h
@@ -2,6 +2,7 @@
 #define __creaImageIOTreeHandlerImageAdder_h_INCLUDED__
 
 #include <creaImageIOTreeHandler.h>
+#include <creaImageIOTimestampDatabaseHandler.h>
 #include <creaImageIOImageReader.h>
 #include <wx/wx.h>
 #include <wx/progdlg.h>
@@ -29,6 +30,8 @@ namespace creaImageIO
     ~TreeHandlerImageAdder();
     /// Sets the TreeHandler
     void SetTreeHandler(TreeHandler* tree) { mTreeHandler = tree;}
+	/// Sets the TimestampDatabaseHandler
+    void SetTimestampHandler(TimestampDatabaseHandler* tdh) { mTimestampHandler = tdh;}
     //====================================================================
 
     //====================================================================
@@ -49,10 +52,10 @@ namespace creaImageIO
 	mNumberAddedFiles = 0;
       }
 
-      int GetNumberScannedFiles() { return mNumberScannedFiles; }
-      int GetNumberScannedDirs() { return mNumberScannedDirs; }
-      int GetNumberHandledFiles() { return mNumberHandledFiles; }
-      int GetNumberAddedFiles() { return mNumberAddedFiles; }
+      int GetNumberScannedFiles() const { return mNumberScannedFiles; }
+      int GetNumberScannedDirs() const { return mNumberScannedDirs; }
+      int GetNumberHandledFiles() const { return mNumberHandledFiles; }
+      int GetNumberAddedFiles() const { return mNumberAddedFiles; }
 
       void IncNumberScannedFiles() { mNumberScannedFiles++; }
       void IncNumberScannedDirs() { mNumberScannedDirs++; }
@@ -60,7 +63,7 @@ namespace creaImageIO
       void IncNumberAddedFiles() { mNumberAddedFiles++; }
 
       void SetStop() { mStop = true; }
-      bool GetStop() { return mStop; }
+      bool GetStop() const { return mStop; }
 
     private:
       bool mStop;
@@ -76,7 +79,6 @@ namespace creaImageIO
     //=============================================
 
     //=============================================
-    //    typedef boost::signals::trackable ProgressObserverType;
     typedef boost::signal<void (Progress&)>  ProgressSignalType;
     typedef ProgressSignalType::slot_function_type ProgressCallbackType;
     //=============================================
@@ -105,27 +107,43 @@ namespace creaImageIO
   private:
 
     /// Adds a single file to the TreeHandler 
-    /// **WITHOUT** testing werther it is handled or not 
+    /// **WITHOUT** testing wether it is handled or not 
     /// hence you have to call IsHandledFile before using AddFile!
     void AddFile( const std::string& filename );
 
     /// Recursive method which does the main job for AddDirectory
     void AddDirectoryRecursor( const std::string& directory, 
 			       bool recurse );
-    
 
     TreeHandler* mTreeHandler;
+	TimestampDatabaseHandler* mTimestampHandler;
     ImageReader mReader;
     
     Progress mProgress;
     ProgressSignalType mProgressSignal;
+
+
   };
   // EO class TreeHandlerImageAdder
   //=======================================================================
 
 
+ 
+
+
 } // 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