X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=9f5a53fef968de35901b2686d5fb02e9d7b0a12e;hb=7ae1412df3d682f639683e751f46a3f07be16d0b;hp=f60480e8365f0762b610b088c582cd52d15eadba;hpb=b573a12c2f9e5c887ae36166c531fb17cdb7db8f;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index f60480e..9f5a53f 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -10,8 +10,11 @@ using namespace crea; #include "icons/remove.xpm" #include "icons/database-add.xpm" #include "icons/help.xpm" +#include "icons/synchronize.xpm" #include +#include +#include namespace creaImageIO { @@ -24,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 { @@ -40,7 +44,8 @@ namespace creaImageIO Icon_page_down, Icon_remove, Icon_database_add, - Icon_help + Icon_help, + Icon_synchronize } icon_id; //================================================================ @@ -196,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(); @@ -219,7 +229,7 @@ namespace creaImageIO // Add Notebook page mNotebook->AddPage( view, crea::std2wx(name) ); - + } //====================================================================== @@ -252,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 @@ -263,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 @@ -288,6 +299,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, @@ -323,21 +335,24 @@ namespace creaImageIO wxPD_CAN_ABORT ); // TO DO : select the current tree handler - mGimmick->AddFiles("Local database",filenames); + mGimmick->AddFiles(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),filenames); mProgressDialog->Pulse(_T("Updating view...")); - UpdateTreeViewLevel("Local database",1); + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); delete mProgressDialog; DisplayAddSummary(); + } - + mViewer->StartPlayer(); } //================================================= //================================================= void WxGimmickView::OnAddDir(wxCommandEvent& event) { + mViewer->StopPlayer(); + std::string name = crea::wx2std(mNotebook->GetCurrentPage()->GetName()); long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; wxDirDialog* FD = new wxDirDialog( 0, @@ -347,41 +362,55 @@ namespace creaImageIO if (FD->ShowModal()==wxID_OK) { + - bool recurse = false; + std::string dirname = wx2std (FD->GetPath()); + bool recurse = isNeedRecursive(dirname); + if (recurse) + { + recurse = wxMessageBox(_T("Recurse into sub-directories ?"), _T("Scan directory"), wxYES_NO,this ) == wxYES ? true : false; + } + + wxBusyCursor busy; + wxString title(_T("Adding directory")); + if (recurse) + title = _T("Adding directory (recursive)"); + mProgressDialog = + new wxProgressDialog(_T("Adding directory"), + _T(""), + 1000, + this, + wxPD_ELAPSED_TIME | + // wxPD_ESTIMATED_TIME | + // wxPD_REMAINING_TIME | + wxPD_CAN_ABORT ); + + mCurrentDirectory = FD->GetPath(); + mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirname,recurse); + mProgressDialog->Pulse(_T("Updating view...")); + + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); + delete mProgressDialog; + DisplayAddSummary(); - if (wxMessageBox(_T("Recurse into sub-directories ?"), - _T("Scan directory"), - wxYES_NO,this ) == wxYES) - { - recurse = true; } - - wxBusyCursor busy; - wxString title(_T("Adding directory")); - if (recurse) - title = _T("Adding directory (recursive)"); - mProgressDialog = - new wxProgressDialog(_T("Adding directory"), - _T(""), - 1000, - this, - wxPD_ELAPSED_TIME | - // wxPD_ESTIMATED_TIME | - // wxPD_REMAINING_TIME | - wxPD_CAN_ABORT ); - std::string dirname = wx2std (FD->GetPath()) ; - mCurrentDirectory = FD->GetPath(); - - // TO DO : select the current tree handler - mGimmick->AddDir("Local database",dirname,recurse); - - mProgressDialog->Pulse(_T("Updating view...")); - - UpdateTreeViewLevel("Local database",1); - delete mProgressDialog; - DisplayAddSummary(); - } + mViewer->StartPlayer(); + } + + //================================================= + // Test a directory to know if contains sub-directory to analyze + bool WxGimmickView::isNeedRecursive(std::string i_name) + { + boost::filesystem::directory_iterator iter(i_name), end_iter; + bool bfindir = false; + for(; iter != end_iter; ++iter) + { + if(boost::filesystem::is_directory(*iter)) + { + return true; + } + } + return false; } //================================================= @@ -396,7 +425,6 @@ namespace creaImageIO if(sel.size()==0) { - valid= ValidateSelected(NULL, mSelectionMinDimension, mSelectionMaxDimension ); @@ -560,14 +588,53 @@ namespace creaImageIO //================================================= void WxGimmickView::OnRemove(wxCommandEvent& event) { - //TODO Select current tree handler + //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) @@ -616,6 +683,44 @@ namespace creaImageIO mess << times; */ wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this); + } + + ////////////////////////////////////////////////// + // Add a DB to application // + // @param event : WxEvent // + // @return : - // + ////////////////////////////////////////////////// + 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); + std::stringstream st; + for(int i = 0; i< files.size(); i++) + { + st<< "remote_" << i+1; + //create TreeHandler + mGimmick->addDB(st.str(), crea::wx2std(files[i])); + //create TreeView + CreateSingleTreeView(st.str()); + } + } + + } //================================================= @@ -625,6 +730,8 @@ 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() //=================================================