X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.h;h=93d982a99c10a12d940665891ec4c957f1596f35;hb=71365e2ce56b1ccf93054818d5d5cf64bcbaafb4;hp=4911b9913281802f0d9e654d235b456f13a73337;hpb=fcfe92562365cb738cf919d095d2f8d3608ec389;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index 4911b99..93d982a 100644
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -2,6 +2,8 @@
 #define __creaImageIOGimmick_h_INCLUDED__
 
 #include <creaImageIOSQLiteTreeHandler.h>
+#include <creaImageIOTreeHandlerImageAdder.h>
+#include <creaImageIOSynchronizer.h>
 
 namespace creaImageIO
 {
@@ -17,6 +19,15 @@ namespace creaImageIO
 	/**
 	* \defgroup GUI Top level graphical user interfaces
 	*/
+	/**
+	* \defgroup IO Image I/O classes
+	*/
+	/**
+	* \defgroup Tree Attributed tree management
+	*/
+	/**
+	* \defgroup Previewer Preview related
+	*/
 
 	/**
 	* \ingroup Controller
@@ -32,6 +43,24 @@ namespace creaImageIO
     /// Dtor
     ~Gimmick();
     
+    ///
+    typedef TreeHandlerImageAdder::Progress AddProgress;
+    typedef TreeHandlerImageAdder::ProgressCallbackType AddProgressCallbackType;
+    
+    /// Adds the function f to the list of functions to call 
+    /// when addition operations progres.
+    /// f is of type AddProgressCallbackType which is:
+    /// void (*AddProgressCallbackType)(AddProgress&)
+    /// To pass a member function 'f' of an instance 'c' of a class 'C' 
+    /// as callback you have to 'bind' it, i.e. call:
+    /// ConnectAddProgressObserver ( boost::bind( &C::f , c, _1 ) );
+     void ConnectAddProgressObserver( AddProgressCallbackType callback )
+    { mImageAdder.ConnectProgressObserver(callback); }
+    
+
+    ///
+    const AddProgress& GetAddProgress() const { return mImageAdder.GetProgress(); }
+
     /// Initialize (read/creates databases, etc.)
     void Initialize();
     
@@ -53,12 +82,18 @@ namespace creaImageIO
     { return mTreeHandlerMap; }
     
 
-    /// Add a file to the given TreeHandler
-    void AddFile(const std::string& handler, const std::string& filename);
+    /// Add the files to the given TreeHandler
+    void AddFiles(const std::string& handler,
+		  const std::vector<std::string>& filenames);
+
     /// Add a dir to the given TreeHandler
     void AddDir(const std::string& handler, const std::string& path, 
 		bool recurse);
 
+	///Synchronizes the loaded data with the database. If remove is true the database will be updated, otherwise 
+	///only a warning sign will be issued
+	void Synchronize(bool update, TreeHandler* handler);
+
     /// Prints the tree handled by the handler
     void Print(const std::string& handler);
 
@@ -79,15 +114,19 @@ namespace creaImageIO
     void CreateUserSettingsDirectory();
     const std::string& GetLocalDatabasePath();
 
+
+    //=============================================
   private:
     SQLiteTreeHandler* mLocalDatabase;
     TreeHandlerMapType mTreeHandlerMap;
+	Synchronizer* mSynchronizer;
 
     std::string mCurrentDirectory;
     std::string mHomeDirectory;
     std::string mUserSettingsDirectory;
     std::string mLocalDatabasePath;
-    
+
+    TreeHandlerImageAdder mImageAdder;
   };
   // EO class Gimmick
   //=======================================================================