X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOGimmick.h;h=6c3b1cc6e231754cced691044bd385d7009da19a;hb=0aa00616066c059f5b11bf6355c22c90c22f95f0;hp=fa39035eb24c698ae57be8e938c20fbd1c63f0d7;hpb=cc5a912f64e8de1f90d9ef0956633515a46d31ae;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index fa39035..6c3b1cc 100644
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -4,7 +4,8 @@
 #include <creaImageIOSQLiteTreeHandler.h>
 #include <creaImageIOTreeHandlerImageAdder.h>
 #include <creaImageIOTimestampDatabaseHandler.h>
-#include <creaImageIOSynchronizer.h>
+#include <creaImageIOSynchron.h>
+#include <creaImageIOSettings.h>
 
 namespace creaImageIO
 {
@@ -36,7 +37,7 @@ namespace creaImageIO
 
   //=======================================================================
   /// Central controler of the gimmick application
-  class Gimmick
+  class CREAIMAGEIO_EXPORT Gimmick
   {
   public:
     /// Ctor
@@ -91,18 +92,28 @@ namespace creaImageIO
     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 
+	/// Removes a file from the given TreeHandler
+	void RemoveFile(const std::string& d, 
+			tree::Node* filename);
+
+	/// Copies the files into the local directory
+	void CopyFiles(const std::vector<std::string>& filenames, const std::string& d );
+  
+
+	///Synchronizes the loaded data with the database d. If repair is true the database will be updated, otherwise 
 	///only a warning sign will be issued
-	void Synchronize(bool update, TreeHandler* handler);
+	std::string Synchronize(const std::string& d, 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);
+    ///create a DB from a given descriptor file and for a specific location
+    SQLiteTreeHandler *createDB(const std::string &i_name, 
+				const std::string &i_locDesc, 
+				const std::string &i_locDB);
 
 	// add an existent DB 
-	void addDB(std::string &i_nameDB, std::string &i_locationDB);
+	void addDB(const std::string &i_nameDB, const std::string &i_locationDB);
 
     /// Returns the TreeHandler with a given name
     TreeHandler* GetTreeHandler(const std::string& name) const;
@@ -115,7 +126,8 @@ namespace creaImageIO
     const SQLiteTreeHandler* GetLocalDatabase() const 
     { return mLocalDatabase; }
 
-    
+	// add DB from Settings file
+    void addDBSettings();
 
     /// 
     const std::string& GetHomeDirectory();
@@ -137,7 +149,7 @@ namespace creaImageIO
     std::string mUserSettingsDirectory;
     std::string mLocalDatabasePath;
 	std::string mTimestampDatabasePath;
-
+	Settings	*mSettings;
     TreeHandlerImageAdder mImageAdder;
   };
   // EO class Gimmick