X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOGimmick.h;h=f93bac1e5d971967e797e9e48426b8cce0138a21;hb=7ae1412df3d682f639683e751f46a3f07be16d0b;hp=4911b9913281802f0d9e654d235b456f13a73337;hpb=fcfe92562365cb738cf919d095d2f8d3608ec389;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index 4911b99..f93bac1 100644
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -2,6 +2,9 @@
 #define __creaImageIOGimmick_h_INCLUDED__
 
 #include <creaImageIOSQLiteTreeHandler.h>
+#include <creaImageIOTreeHandlerImageAdder.h>
+#include <creaImageIOTimestampDatabaseHandler.h>
+#include <creaImageIOSynchron.h>
 
 namespace creaImageIO
 {
@@ -17,6 +20,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 +44,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,18 +83,36 @@ 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);
 
+	/// Removes a file from the given TreeHandler
+	void RemoveFile(const std::string& d, 
+			const tree::Node* & filename);
+
+	///Synchronizes the loaded data with the database. If remove is true the database will be updated, otherwise 
+	///only a warning sign will be issued
+	std::string Synchronize(bool repair, bool checkAttributes);
+
     /// Prints the tree handled by the handler
     void Print(const std::string& handler);
+	
+	///create a DB from a given descriptor file and for a specific location
+	SQLiteTreeHandler *createDB(std::string &i_name, std::string &i_locDesc, std::string &i_locDB);
 
+	// add an existent DB 
+	void addDB(std::string &i_nameDB, std::string &i_locationDB);
 
     /// Returns the TreeHandler with a given name
     TreeHandler* GetTreeHandler(const std::string& name) const;
+
+	/// Returns the TimestampDatabase
+	TimestampDatabaseHandler* GetTimestampDatabase() const;
     /// 
     SQLiteTreeHandler* GetLocalDatabase() { return mLocalDatabase; }
 
@@ -78,16 +126,23 @@ namespace creaImageIO
     const std::string& GetUserSettingsDirectory();
     void CreateUserSettingsDirectory();
     const std::string& GetLocalDatabasePath();
+	const std::string& GetTimestampDatabasePath();
+
 
+    //=============================================
   private:
     SQLiteTreeHandler* mLocalDatabase;
+	TimestampDatabaseHandler* mTimestampDatabase;
     TreeHandlerMapType mTreeHandlerMap;
+	Synchronizer* mSynchronizer;
 
     std::string mCurrentDirectory;
     std::string mHomeDirectory;
     std::string mUserSettingsDirectory;
     std::string mLocalDatabasePath;
-    
+	std::string mTimestampDatabasePath;
+
+    TreeHandlerImageAdder mImageAdder;
   };
   // EO class Gimmick
   //=======================================================================