X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.h;h=cdb76764fcb99f143b7ccac4c6d4c827f691151e;hb=2640fa9a19a36c5e5aa5295d8eb5d43c41755892;hp=cebcbd5870602d58eb82e6b094fd3ee963456f2b;hpb=4ef5bb7efa72c0d9a016f270b5a56e8302f6e209;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index cebcbd5..cdb7676 100644
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -2,6 +2,7 @@
 #define __creaImageIOGimmick_h_INCLUDED__
 
 #include <creaImageIOSQLiteTreeHandler.h>
+#include <creaImageIOTreeHandlerImageAdder.h>
 
 namespace creaImageIO
 {
@@ -14,6 +15,18 @@ namespace creaImageIO
 	/**
 	* \defgroup Model Model
 	*/
+	/**
+	* \defgroup GUI Top level graphical user interfaces
+	*/
+	/**
+	* \defgroup IO Image I/O classes
+	*/
+	/**
+	* \defgroup Tree Attributed tree management
+	*/
+	/**
+	* \defgroup Previewer Preview related
+	*/
 
 	/**
 	* \ingroup Controller
@@ -29,6 +42,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();
     
@@ -36,22 +67,41 @@ namespace creaImageIO
     void Finalize();
 
     /// Sets level for messages "Gimmick!" 
-    void SetMessageLevel(int level);
-   /// Sets level for debug messages "Gimmick! DEBUG" 
-    void SetDebugMessageLevel(int level);
+    static void SetMessageLevel(int level);
+    /// Sets level for debug messages "Gimmick! DEBUG" 
+    static void SetDebugMessageLevel(int level);
+    
+    /// Type of map from TreeHandler name to TreeHandler*
+    typedef std::map<std::string, TreeHandler*> TreeHandlerMapType;
+
+    /// Returns the TreeHandlerMap (ref)
+    TreeHandlerMapType& GetTreeHandlerMap() { return mTreeHandlerMap; }
+    /// Returns the TreeHandlerMap (const ref)
+    const TreeHandlerMapType& GetTreeHandlerMap() const
+    { return mTreeHandlerMap; }
+    
 
-    /// Add a file to the local database
-    void AddFileToLocalDatabase(const std::string&);
-    /// Add a dir to the local database
-    void AddDirToLocalDatabase(const std::string&, bool recurse);
+    /// 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);
+
+    /// Prints the tree handled by the handler
+    void Print(const std::string& handler);
 
-    ///
-    void PrintLocalDatabase();
 
+    /// Returns the TreeHandler with a given name
+    TreeHandler* GetTreeHandler(const std::string& name) const;
     /// 
     SQLiteTreeHandler* GetLocalDatabase() { return mLocalDatabase; }
 
-    const SQLiteTreeHandler* GetLocalDatabase() const { return mLocalDatabase; }
+    const SQLiteTreeHandler* GetLocalDatabase() const 
+    { return mLocalDatabase; }
+
+    
 
     /// 
     const std::string& GetHomeDirectory();
@@ -59,14 +109,18 @@ namespace creaImageIO
     void CreateUserSettingsDirectory();
     const std::string& GetLocalDatabasePath();
 
+
+    //=============================================
   private:
     SQLiteTreeHandler* mLocalDatabase;
- 
+    TreeHandlerMapType mTreeHandlerMap;
+
     std::string mCurrentDirectory;
     std::string mHomeDirectory;
     std::string mUserSettingsDirectory;
     std::string mLocalDatabasePath;
-    
+
+    TreeHandlerImageAdder mImageAdder;
   };
   // EO class Gimmick
   //=======================================================================