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

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index 4911b99..4e7ec07 100644
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -2,6 +2,9 @@
 #define __creaImageIOGimmick_h_INCLUDED__
 
 #include <creaImageIOSQLiteTreeHandler.h>
+#include <creaImageIOTreeHandlerImageAdder.h>
+#include <creaImageIOSynchron.h>
+#include <creaImageIOSettings.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
@@ -24,7 +36,7 @@ namespace creaImageIO
 
   //=======================================================================
   /// Central controler of the gimmick application
-  class Gimmick
+  class CREAIMAGEIO_EXPORT Gimmick
   {
   public:
     /// Ctor
@@ -32,8 +44,28 @@ namespace creaImageIO
     /// Dtor
     ~Gimmick();
     
-    /// Initialize (read/creates databases, etc.)
+    ///
+    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(); }
+
+    /// Initializes with default values (read/creates databases, etc.)
     void Initialize();
+
+	/// Initializes with the local database descriptor in the path given (read/creates databases, etc.)
+    void Initialize(const std::string& path);
     
     /// Finalize (closes databases, etc.)
     void Finalize();
@@ -50,44 +82,90 @@ namespace creaImageIO
     TreeHandlerMapType& GetTreeHandlerMap() { return mTreeHandlerMap; }
     /// Returns the TreeHandlerMap (const ref)
     const TreeHandlerMapType& GetTreeHandlerMap() const
-    { return mTreeHandlerMap; }
-    
+    { return mTreeHandlerMap; }    
+
+    /// Add the files to the given TreeHandler
+    void AddFiles(const std::string& handler,
+		  const std::vector<std::string>& filenames);
 
-    /// Add a file to the given TreeHandler
-    void AddFile(const std::string& handler, const std::string& filename);
     /// 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, 
+			tree::Node* filename);
+
+	///Deletes the given drive name from the databases
+	void DeleteDrive(const std::string& drive);
+  
+
+	/// 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
+	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(const std::string &i_name, 
+				const std::string &i_locDesc, 
+				const std::string &i_locDB);
 
+	/// add an existent DB 
+	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;
-    /// 
+
+	/// 
     SQLiteTreeHandler* GetLocalDatabase() { return mLocalDatabase; }
 
     const SQLiteTreeHandler* GetLocalDatabase() const 
     { return mLocalDatabase; }
 
-    
+	///Returns the given setting value for the given setting parameter
+	void GetSetting(const std::string& name, std::string& value);
+
+	///Updates the settings file
+	void UpdateSetting(const std::string& name, const std::string& value);
+
+	/// add DB from Settings file
+    void addDBSettings();
 
+	///Edits the field described by the name and key provided with the value given
+	void EditField(tree::Node* node, const std::string& d, const std::string& name, const std::string& key, const std::string& val);
+
+	/// Returns the attributes in results described in params
+	void GetAttributes(const std::string& d, 
+	  const std::string& filename, 
+	  const std::vector<std::string>& params, 
+	  std::vector<std::string>& results);
+  
     /// 
     const std::string& GetHomeDirectory();
     const std::string& GetUserSettingsDirectory();
     void CreateUserSettingsDirectory();
     const std::string& GetLocalDatabasePath();
+	
+
 
+    //=============================================
   private:
     SQLiteTreeHandler* mLocalDatabase;
-    TreeHandlerMapType mTreeHandlerMap;
+	TreeHandlerMapType mTreeHandlerMap;
+	Synchronizer* mSynchronizer;
 
     std::string mCurrentDirectory;
     std::string mHomeDirectory;
     std::string mUserSettingsDirectory;
     std::string mLocalDatabasePath;
-    
+	Settings	*mSettings;
+    TreeHandlerImageAdder mImageAdder;
   };
   // EO class Gimmick
   //=======================================================================