X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeHandlerImageAdder.h;h=53cff0b7b325d8ec8ac4fe1dc688014e7b4bc651;hb=595926ac27740a8822b6de9579e2e148c59f469c;hp=e490509100a1469e2837639ae6f42f29a06c6646;hpb=42f7c93a6f8fc2beeb8709be1b3616ec40f4699e;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeHandlerImageAdder.h b/src2/creaImageIOTreeHandlerImageAdder.h
index e490509..53cff0b 100644
--- a/src2/creaImageIOTreeHandlerImageAdder.h
+++ b/src2/creaImageIOTreeHandlerImageAdder.h
@@ -3,9 +3,11 @@
 
 #include <creaImageIOTreeHandler.h>
 #include <creaImageIOTimestampDatabaseHandler.h>
+#include <creaImageIOSynchron.h>
 #include <creaImageIOImageReader.h>
 #include <wx/wx.h>
 #include <wx/progdlg.h>
+#include <creaWx.h>
 // Signal/slot mechanism for progress events
 #include <boost/signal.hpp>
 #include <boost/bind.hpp>
@@ -22,6 +24,7 @@ namespace creaImageIO
 
   class TreeHandlerImageAdder
   {
+	  
   public:
     //====================================================================
     /// Ctor
@@ -32,6 +35,10 @@ namespace creaImageIO
     void SetTreeHandler(TreeHandler* tree) { mTreeHandler = tree;}
 	/// Sets the TimestampDatabaseHandler
     void SetTimestampHandler(TimestampDatabaseHandler* tdh) { mTimestampHandler = tdh;}
+	/// Sets the synchronizer
+	void SetSynchronizer(Synchronizer* s){mSynchronizer=s;}
+	/// Sets the synchronizer
+	void SetCurrentDatabase(std::string cur){mCurrentDB=cur;}
     //====================================================================
 
     //====================================================================
@@ -101,7 +108,40 @@ namespace creaImageIO
     void AddFiles( const std::vector<std::string>& filename );
     /// (Recursively) adds the files of a directory to the TreeHandler 
     void AddDirectory( const std::string& directory, 
-		       bool recurse );
+		       bool recurse);
+	/// Removes a file from the databases
+	void RemoveFile(tree::Node* node);
+	/// Removes files from the databases
+	void RemoveFiles(const std::vector<tree::Node*>& nodes);
+	/// Synchronizes the DB and disk by repeating the operations the user has done and returns a report
+	std::string Synchronize(bool repair, bool checkAttributes);
+	///Recursively checks if the directory is synchronized and optionally the state of the attributes
+	void CheckSyncDirectory(const std::string &dirpath, 
+							bool recursive, 
+							bool repair,
+							bool checkAttributes,
+							std::vector<std::string> &i_ignorefiles,
+							std::vector<std::string> & attsModified,
+							std::vector<std::string> & newfiles);
+	///Copies the files indicated in the vector and updates all databases
+	void CopyFiles(const std::vector<std::string>& filenames, const std::string directory  );
+	///Finds the node that matches the specified parameters
+	void FindNode(tree::Node* parent, int level, 
+		const std::string& searchParam, 
+		const std::string& searchVal, 
+		tree::Node*& node);
+
+	///Finds the nodes that partially match the searchVal
+	void FindNodePartial(tree::Node* parent, int level, const std::string& searchParam, const std::string& searchVal, tree::Node*& node);
+ 
+	///Checks the attributes of the database against the ones in disk
+	void CheckAttributes(bool repair, std::string& file, std::vector<std::string>& attsModified);
+	///Deletes the drive with the given name (use for all databases except maintenance and timestamp)
+	void DeleteDriveFromMainDB(const std::string& drive);
+	///Deletes the drive with the given name (use for maintenance and timestamp databases)
+	void DeleteDriveFromOtherDB(const std::string& drive);
+  
+ 
     //====================================================================
 
   private:
@@ -113,11 +153,14 @@ namespace creaImageIO
 
     /// Recursive method which does the main job for AddDirectory
     void AddDirectoryRecursor( const std::string& directory, 
-			       bool recurse );
+			       bool recurse,
+			   const std::string &addKey);
 
     TreeHandler* mTreeHandler;
 	TimestampDatabaseHandler* mTimestampHandler;
+	Synchronizer* mSynchronizer;
     ImageReader mReader;
+	std::string mCurrentDB;
     
     Progress mProgress;
     ProgressSignalType mProgressSignal;