X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxGimmickView.cpp;h=9c3ab8345d550731cf39eb2cd9a6c7fc13855a55;hb=cc5a912f64e8de1f90d9ef0956633515a46d31ae;hp=f41ec3e5323fbe994e81226facd51a3d4d962d4e;hpb=eb6dbb22921be6bf7061773b25205446619966c6;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index f41ec3e..9c3ab83 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -206,13 +206,13 @@ namespace creaImageIO
  
   //======================================================================
   /// Create the tree view for TreeHandler provided
-  void WxGimmickView::CreateTreeView( TreeHandler* h)
+  void WxGimmickView::CreateTreeView( TreeHandler* h, TimestampDatabaseHandler* tdh)
   {
     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,this,mNotebook,-1);
+    WxTreeView* view = new WxTreeView(h,tdh,this,mNotebook,-1);
 
     // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT
     // ALREADY IN THE MAP
@@ -289,6 +289,7 @@ namespace creaImageIO
   //=================================================
   void WxGimmickView::OnAddFiles(wxCommandEvent& event)
   {
+    mViewer->StopPlayer();
    long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
     std::string wc("*.*");
     wxFileDialog* FD = new wxFileDialog( 0, 
@@ -331,14 +332,16 @@ namespace creaImageIO
 	UpdateTreeViewLevel("Local database",1);
 	delete mProgressDialog;
 	DisplayAddSummary();	
+
       }
-	
+	mViewer->StartPlayer();	
   }
   //=================================================
 
   //=================================================
   void WxGimmickView::OnAddDir(wxCommandEvent& event)
   {
+    mViewer->StopPlayer();
     long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
     wxDirDialog* FD = 
       new wxDirDialog( 0, 
@@ -348,6 +351,7 @@ namespace creaImageIO
     
     if (FD->ShowModal()==wxID_OK)
       {
+
 	
 		  std::string dirname = wx2std (FD->GetPath());
 		  bool recurse =  isNeedRecursive(dirname);
@@ -380,7 +384,9 @@ namespace creaImageIO
 		UpdateTreeViewLevel("Local database",1);
 		delete mProgressDialog;
 		DisplayAddSummary();
+
 	  }
+    mViewer->StartPlayer();
   }
 
     //=================================================
@@ -575,7 +581,7 @@ namespace creaImageIO
   //=================================================
   void WxGimmickView::OnRemove(wxCommandEvent& event)
   {
-	//TODO Select current tree handler       
+  	//TODO Select current tree handler       
     wxBusyCursor busy;
     GetTreeViewMap()["Local database"]->RemoveSelected();
 
@@ -631,6 +637,36 @@ namespace creaImageIO
     mess << times;
     */
     wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this);
+  }
+
+  void WxGimmickView::OnAddDB(wxCommandEvent& event)
+  {
+    
+	  //Select DB
+	  long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
+	  std::string wc("*.sqlite3*");
+	  wxFileDialog* FD = new wxFileDialog( 0, 
+					 _T("Select file"),
+					 _T(""),
+					 _T(""),
+					 crea::std2wx(wc),
+					 style,
+					 wxDefaultPosition);
+    
+    if (FD->ShowModal()==wxID_OK)
+	{
+		wxBusyCursor busy;
+		wxArrayString files;
+		FD->GetPaths(files);
+		for(int i = 0; i< files.size(); i++)
+		{
+			std::string snb = "remote_1";
+			mGimmick->addDB(snb, crea::wx2std(files[i]));
+		//	UpdateTreeViewLevel("remote_1",1);
+		}
+	}
+    
+		
   }
 
    //=================================================
@@ -640,6 +676,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_ADDDATABASE_ID, WxGimmickView::OnAddDB)
   END_EVENT_TABLE()
   //=================================================