X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=9f5a53fef968de35901b2686d5fb02e9d7b0a12e;hb=7ae1412df3d682f639683e751f46a3f07be16d0b;hp=024bc8c19589838b05252260ae162b0cb466aa01;hpb=9b50453dd44ee2b9b94d1f81035bdd2c9850db19;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 024bc8c..9f5a53f 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -10,8 +10,10 @@ using namespace crea;
 #include "icons/remove.xpm"
 #include "icons/database-add.xpm"
 #include "icons/help.xpm"
+#include "icons/synchronize.xpm"
 
 #include <wx/imaglist.h>
+#include <wx/popupwin.h>
 #include<boost/filesystem/operations.hpp>
 
 namespace creaImageIO
@@ -25,13 +27,14 @@ namespace creaImageIO
       TOOL_ADDDIR_ID = 2,
       TOOL_REMOVE_ID = 3,
       TOOL_ADDDATABASE_ID = 4,
-      TOOL_HELP_ID = 5
+      TOOL_HELP_ID = 5,
+	  TOOL_SYNCHRONIZE_ID = 6
     };
   //======================================================================
 
   //================================================================
   // 
-  const int icon_number = 7;
+  const int icon_number = 8;
   // Icon ids
   typedef enum
     {
@@ -41,7 +44,8 @@ namespace creaImageIO
       Icon_page_down,
       Icon_remove,
       Icon_database_add,
-      Icon_help
+      Icon_help,
+	  Icon_synchronize
     }
     icon_id;
   //================================================================
@@ -197,6 +201,11 @@ namespace creaImageIO
 				      mIcon->GetBitmap(Icon_help),
 				      _T("Open help window")
 				      );
+	mToolSynchronize = mToolBar->AddTool( TOOL_SYNCHRONIZE_ID, 
+				      _T("Synchronize"),
+				      mIcon->GetBitmap(Icon_synchronize),
+				      _T("Synchronizes the database with disk")
+				      );
     //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL)
 
     mToolBar->Realize();
@@ -206,13 +215,13 @@ namespace creaImageIO
  
   //======================================================================
   /// Create the tree view for TreeHandler provided
-  void WxGimmickView::CreateTreeView( TreeHandler* h, TimestampDatabaseHandler* tdh)
+  void WxGimmickView::CreateTreeView( TreeHandler* h)
   {
     std::string name(h->GetTree().GetAttribute("Name"));
     GimmickMessage(2,"Creating the tree view for '"<<
 		   name<<"'"<<std::endl);
     // Create the WxTreeView
-    WxTreeView* view = new WxTreeView(h,tdh,this,mNotebook,-1);
+    WxTreeView* view = new WxTreeView(h,this,mNotebook,-1);
 
     // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT
     // ALREADY IN THE MAP
@@ -253,7 +262,7 @@ namespace creaImageIO
   void WxGimmickView::CreateIconList()
   {
     // Size of the icons;
-    int size = 24;
+    int size = 16;
 
     wxIcon icons[20];
     // should correspond to Icon_xxx enum
@@ -264,6 +273,7 @@ namespace creaImageIO
     icons[Icon_remove] = wxIcon(remove_xpm);
     icons[Icon_database_add] = wxIcon(database_add_xpm);
     icons[Icon_help] = wxIcon(help_xpm);
+	icons[Icon_synchronize] = wxIcon(synchronize_xpm);
 
     //   unsigned int NbIcons = 8;
     // Make an image list containing small icons
@@ -415,7 +425,6 @@ namespace creaImageIO
 	
 	if(sel.size()==0)
 	{
-		
 		valid= ValidateSelected(NULL,
 				mSelectionMinDimension,
 				mSelectionMaxDimension );
@@ -582,11 +591,50 @@ namespace creaImageIO
   	//TODO Select current tree handler       
     wxBusyCursor busy;
     GetTreeViewMap()["Local database"]->RemoveSelected();
-
 	ClearSelection();
   }
   //=================================================
 
+  
+  //=================================================
+  void WxGimmickView::AddIgnoreFile(const tree::Node* & toRemove)
+  {
+	  mGimmick->RemoveFile("Local database",toRemove);
+	  GetTreeViewMap()["Local database"]->UpdateLevel(1);
+  }
+
+   //=================================================
+  void WxGimmickView::OnSynchronize(wxCommandEvent& event)
+  {       
+    wxBusyCursor busy;
+	const wxString choices[] = { _T("Check database for file deletion or addition and give a report."), 
+								_T("Check database for file deletion or addition and attribute change and give a report."), 
+								_T("Repair database (removes deleted files and adds new files)."), 
+								_T("Repair database (removes deleted files, adds new files and resets changed attributes).") } ;
+
+    wxSingleChoiceDialog dialog(this,
+								_T("Select one of the following synchronization actions:\n")
+                                _T("Plase note that, due to the heavy amount of operations required, this action might take a while."),
+                                _T("Synchronization Settings"),
+                                WXSIZEOF(choices), choices);
+
+    //dialog.SetSelection(0);
+
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        int sel=dialog.GetSelection();
+		bool repair=false;
+		bool checkAttributes=false;
+		if(sel==2 || sel==3){repair=true;}
+		if(sel==1 || sel==3){checkAttributes=true;}
+		std::string mess=mGimmick->Synchronize(repair, checkAttributes);
+		wxMessageBox(std2wx(mess),_T("Synchronization result"),wxOK,this);
+		GetTreeViewMap()["Local database"]->UpdateLevel(1);
+		
+    }
+  }
+  //=================================================
+
   //=================================================
   /// AddProgress Gimmick callback
   void WxGimmickView::OnAddProgress( Gimmick::AddProgress& p)
@@ -682,6 +730,7 @@ namespace creaImageIO
     EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles)
     EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir)
 	EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove)
+	EVT_TOOL(TOOL_SYNCHRONIZE_ID, WxGimmickView::OnSynchronize)
 	EVT_TOOL(TOOL_ADDDATABASE_ID, WxGimmickView::OnAddDB)
   END_EVENT_TABLE()
   //=================================================