X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=4381a6e1a38e422714d0d6fa19c93fd093555108;hb=8b74b6a37dfc8b8a3ebb4f9f8e4b46429da0e4c7;hp=ce9c01e0e330cd1479cc1a68acb5ffaaf89b6c0a;hpb=677d919d8f9ffc26b332f717e9cbddf4c0670dfe;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index ce9c01e..4381a6e 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -36,19 +36,19 @@ namespace creaImageIO
 
   //================================================================
   // 
-  const int icon_number = 8;
+  const int icon_number = 9;
   // Icon ids
   typedef enum
     {
+	  Icon_create_database,
       Icon_accept,
       Icon_add,
       Icon_folder_down,
       Icon_page_down,
+	  Icon_database_add,
       Icon_remove,
-      Icon_database_add,
-      Icon_help,
 	  Icon_synchronize,
-	  Icon_create_database
+      Icon_help
     }
     icon_id;
   //================================================================
@@ -466,8 +466,7 @@ namespace creaImageIO
 				mSelectionMaxDimension );
 		}
 	}
-	
-    mText->SetLabel(crea::std2wx(GetMessage()));
+	mText->SetLabel(crea::std2wx(GetMessage()));
     /*if(valid)
       {
 	ReadImageThreaded(sel);
@@ -606,10 +605,10 @@ namespace creaImageIO
 
   
   //=================================================
-  void WxGimmickView::AddIgnoreFile(const tree::Node* & toRemove)
+  void WxGimmickView::AddIgnoreFile(tree::Node* toRemove)
   {
-	  mGimmick->RemoveFile("Local database",toRemove);
-	  GetTreeViewMap()["Local database"]->UpdateLevel(1);
+	  mGimmick->RemoveFile(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),toRemove);
+	  GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1);
   }
 
    //=================================================
@@ -636,9 +635,11 @@ namespace creaImageIO
 		bool checkAttributes=false;
 		if(sel==2 || sel==3){repair=true;}
 		if(sel==1 || sel==3){checkAttributes=true;}
-		std::string mess=mGimmick->Synchronize(repair, checkAttributes);
+		std::string mess=mGimmick->Synchronize(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),repair, checkAttributes);
 		wxMessageBox(std2wx(mess),_T("Synchronization result"),wxOK,this);
-		GetTreeViewMap()["Local database"]->UpdateLevel(1);
+		if(sel==2 || sel==3){
+		GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1);
+		}
 		
     }
   }
@@ -722,14 +723,14 @@ namespace creaImageIO
 		for(int i = 0; i< files.size(); i++)
 		{
 			//get name of DB (file name)
-			size_t pos = files[i].find_last_of("\\");
-			std::string name = crea::wx2std(files[i].substr(pos+1));
-			pos = name.find_last_of(".");
-			name = name.substr(0,pos);
-			//create TreeHandler
-			mGimmick->addDB(name, crea::wx2std(files[i]));
-			//create TreeView
-			CreateSingleTreeView(name);
+		  size_t pos = files[i].find_last_of(_T("\\"));
+		  std::string name = crea::wx2std(files[i].substr(pos+1));
+		  pos = name.find_last_of(".");
+		  name = name.substr(0,pos);
+		  //create TreeHandler
+		  mGimmick->addDB(name, crea::wx2std(files[i]));
+		  //create TreeView
+		  CreateSingleTreeView(name);
 		}
 	}
   }
@@ -780,7 +781,6 @@ namespace creaImageIO
    //=================================================
   BEGIN_EVENT_TABLE(WxGimmickView, wxPanel)
     EVT_TOOL(TOOL_CREATEDB_ID, WxGimmickView::OnCreateDB)
-	EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnCreateDB)
     EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles)
     EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir)
 	EVT_TOOL(TOOL_ADDDATABASE_ID, WxGimmickView::OnAddDB)