X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=9f5a53fef968de35901b2686d5fb02e9d7b0a12e;hb=7ae1412df3d682f639683e751f46a3f07be16d0b;hp=7992b56a699ea13f6217243fe45ec45c84efe252;hpb=00e4672c3c43da02dbbab0f23bf076c2c36532ea;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 7992b56..9f5a53f 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -10,11 +10,15 @@ 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 { + //====================================================================== // The ids of the different tools enum @@ -23,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 { @@ -39,7 +44,8 @@ namespace creaImageIO Icon_page_down, Icon_remove, Icon_database_add, - Icon_help + Icon_help, + Icon_synchronize } icon_id; //================================================================ @@ -110,30 +116,36 @@ namespace creaImageIO // Bottom panel mBottomPanel = new wxPanel(mSplitter,-1); - wxBoxSizer *bottom_sizer = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer *bottom_sizer = new wxBoxSizer(wxVERTICAL); //HORIZONTAL); - mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Status: Welcome to Gimmick!")); - bottom_sizer->Add(mText,1,wxGROW,0); // Previewer mViewer = new WxViewer(mBottomPanel, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize ); - mViewer->SetMovieSize(1); - mViewer->SetImage(0,GetDefaultImage()); + pointers.push_back(new ImagePointerHolder(GetDefaultImage())); + mViewer->SetImageVector(pointers); + mViewer->StartPlayer(); + - bottom_sizer->Add(mViewer,1,wxGROW,0); + bottom_sizer->Add(mViewer,1,wxGROW,1); // mViewer->Show(); + mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Welcome to Gimmick!")); + bottom_sizer->Add(mText,0,wxGROW,0); + + + mBottomPanel->SetSizer(bottom_sizer); // Splitting int hsize = size.GetHeight(); - int bottom_minsize = 40; + int top_minsize = 450; + int bottom_minsize = 50; mSplitter->SetMinimumPaneSize( bottom_minsize ); mSplitter->SplitHorizontally( mNotebook, mBottomPanel, - hsize - bottom_minsize); - + top_minsize); + sizer->Add( mSplitter,1,wxGROW ,0); @@ -149,6 +161,8 @@ namespace creaImageIO /// Destructor WxGimmickView::~WxGimmickView() { + // stop the viewer before application exit. + mViewer->StopPlayer(); GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <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(); @@ -210,35 +229,40 @@ namespace creaImageIO // Add Notebook page mNotebook->AddPage( view, crea::std2wx(name) ); - - } - //====================================================================== - /// Returns the selected Image so that it complies with the given parameter(<4D) - vtkImageData* WxGimmickView::GetSelectedImage(int dim) - { - return NULL; - //GetTreeViewMap()["Local database"]->GetSelectedImage(dim); + } //====================================================================== - /// Returns the selected Images so that they comply with the given parameter(4D) void WxGimmickView::GetSelectedImages(std::vector& s, int dim) { - int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels(); - std::vector im=GetTreeViewMap()["Local database"]->GetSelected(level+1); - ReadImagesNotThreaded(s,im,dim); + std::vector files; + GetTreeViewMap()["Local database"]->GetSelectedAsString(files); + ReadImagesNotThreaded(s,files,dim); } //====================================================================== - /// Returns the selected Images so that they comply with the given parameter(4D) + + //====================================================================== void WxGimmickView::GetSelectedFiles(std::vector& s) { GetTreeViewMap()["Local database"]->GetSelectedAsString(s); } + //====================================================================== + + //====================================================================== + void WxGimmickView::GetImages(int dim, + const std::vector& files, + std::vector& s) + { + ReadImagesNotThreaded(s,files,dim); + } + //====================================================================== + + //================================================= void WxGimmickView::CreateIconList() { // Size of the icons; - int size = 24; + int size = 16; wxIcon icons[20]; // should correspond to Icon_xxx enum @@ -249,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 @@ -274,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, @@ -309,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, @@ -333,64 +362,112 @@ namespace creaImageIO if (FD->ShowModal()==wxID_OK) { + - bool recurse = false; - if (wxMessageBox(_T("Recurse into sub-directories ?"), - _T("Scan directory"), - wxYES_NO,this ) == wxYES) - { - recurse = true; + 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(); + } - - 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; } //================================================= //================================================= - void WxGimmickView::OnSelectionChange(std::vector& sel) + void WxGimmickView::OnSelectionChange(const std::vector& sel, bool isSelection, int selection, bool needProcess) { GimmickDebugMessage(5, "WxGimmickView::OnSelectionChange" <SetLabel(_T("Status: ")+crea::std2wx(GetMessage())); - if(valid) + bool valid=true; + + if(sel.size()==0) + { + valid= ValidateSelected(NULL, + mSelectionMinDimension, + mSelectionMaxDimension ); + } + else if(needProcess) + { + ResetExtent(); + std::vector::const_iterator i; + for(i=sel.begin();i!=sel.end()&&valid;++i) + { + valid= ValidateSelected((*i), + mSelectionMinDimension, + mSelectionMaxDimension ); + } + } + else if(isSelection) + { + valid= ValidateSelected(sel.front(), + mSelectionMinDimension, + mSelectionMaxDimension ); + } + else + { + ResetExtent(); + std::vector::const_iterator i; + for(i=sel.begin();i!=sel.end()&&valid;++i) + { + valid= ValidateSelected((*i), + mSelectionMinDimension, + mSelectionMaxDimension ); + } + } + + mText->SetLabel(crea::std2wx(GetMessage())); + /*if(valid) { ReadImageThreaded(sel); } else { - mViewer->SetMovieSize(1); - mViewer->SetImage(0,GetDefaultImage()); - // mViewer->Hide(); - } + ClearSelection(); + }*/ + ReadImageThreaded(sel); } @@ -399,7 +476,7 @@ namespace creaImageIO //================================================== ///Reads Images (Threaded) - void WxGimmickView::ReadImageThreaded(std::vector sel) + void WxGimmickView::ReadImageThreaded(const std::vector& sel) { GimmickDebugMessage(5, "ReadImageThreaded" @@ -407,24 +484,27 @@ namespace creaImageIO int maxprio = GetMaximalPriority(); int prio = maxprio + 2000; - mViewer->SetMovieSize(sel.size());//ClearImages(); - + if(sel.size()>0) + { //First load the selected images mCurImageItemToShow = sel.front(); + pointers.clear(); int index = 0; - std::vector::iterator selected; + std::vector::const_iterator selected; for(selected=sel.begin();selected!=sel.end();++selected) { GimmickDebugMessage(5, "Requesting image from selected " <<(*selected)->GetAttribute("FullFileName") <SetImageVector(pointers); //Going up prio = maxprio + 20; std::vector up; @@ -436,7 +516,8 @@ namespace creaImageIO "Requesting image from neighbors up " <<(*iterUp)->GetAttribute("FullFileName") <GetAttribute("FullFileName") <SetImageVector(pointers); + } } //================================================== - //================================================== - /// Processes the queue of image events - void WxGimmickView::ProcessImageEvents() - { - if (!mConstructed) return; - - // int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels(); - // std::vector sel=GetTreeViewMap()["Local database"]->GetSelected(level+1); - /* - GimmickDebugMessage(5, - "Processing Images. Lock Started" - <=0) - { - mViewer->SetImage(index,image); - } - /* - tree::Node* node=GetNextNodeQueued(); - - - bool found=false; - std::vector::iterator i; - for(i=sel.begin();i!=sel.end()&&!found;++i) - { - if((*i)==node) - { - mViewer->AddImage(image); - found=true; - } - } - */ - - } - UnqueueNext(); - } - /* - if(!(mViewer->ImagesEmpty())) - { - GimmickDebugMessage(5, - "Showing images" - <ShowImages(); - // mViewer->Show(); - } - */ - ClearQueue(); - - - MultiThreadImageReaderEventUnlock(); - /* - GimmickDebugMessage(5, - "Processing Images. Lock Ended" - <SetMovieSize(1); - mViewer->SetImage(0,GetDefaultImage()); - first_time = false; + { + first_time = false; } - // mViewer->Refresh(); + // GimmickMessage(1,"WxGimmickView : Refresh viewer"<StartPlayer(); + if(mViewer) + { + mViewer->RefreshIfNecessary(); + } + } + + //================================================== + + //================================================== + void WxGimmickView::ClearSelection() + { + pointers.clear(); + pointers.push_back(new ImagePointerHolder(GetDefaultImage())); + mViewer->SetImageVector(pointers); + mViewer->RefreshIfNecessary(); + ResetExtent(); } //================================================= @@ -554,9 +588,50 @@ namespace creaImageIO //================================================= void WxGimmickView::OnRemove(wxCommandEvent& event) { - //TODO Select current tree handler + //TODO Select current tree handler wxBusyCursor busy; - GetTreeViewMap()["Local database"]->RemoveSelected(1); + 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); + + } } //================================================= @@ -566,7 +641,8 @@ namespace creaImageIO { char mess[200]; - sprintf(mess,"%i dirs - %i files - %i handled - %i added", + + sprintf(mess,"%i dirs : %i files :\n %i handled - %i added", p.GetNumberScannedDirs(), p.GetNumberScannedFiles(), p.GetNumberHandledFiles(), @@ -607,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()); + } + } + + } //================================================= @@ -616,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() //=================================================