X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=9c3ab8345d550731cf39eb2cd9a6c7fc13855a55;hb=cc5a912f64e8de1f90d9ef0956633515a46d31ae;hp=2d8785147b5754b69a9c2d69bc715f89acbd8f31;hpb=fc165c73bc8482c01caeee7c67405962f846a9b6;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 2d87851..9c3ab83 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -12,6 +12,7 @@ using namespace crea; #include "icons/help.xpm" #include +#include namespace creaImageIO { @@ -156,6 +157,8 @@ namespace creaImageIO /// Destructor WxGimmickView::~WxGimmickView() { + // stop the viewer before application exit. + mViewer->StopPlayer(); GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <GetTree().GetAttribute("Name")); GimmickMessage(2,"Creating the tree view for '"<< name<<"'"<& 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() { @@ -274,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, @@ -316,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, @@ -333,45 +351,63 @@ 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(); + + // 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(); + } - - 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, bool isSelection, int selection, bool needProcess) + void WxGimmickView::OnSelectionChange(const std::vector& sel, bool isSelection, int selection, bool needProcess) { GimmickDebugMessage(5, "WxGimmickView::OnSelectionChange" @@ -388,8 +424,8 @@ namespace creaImageIO } else if(needProcess) { - ClearStatus(); - std::vector::iterator i; + ResetExtent(); + std::vector::const_iterator i; for(i=sel.begin();i!=sel.end()&&valid;++i) { valid= ValidateSelected((*i), @@ -405,8 +441,8 @@ namespace creaImageIO } else { - ClearStatus(); - std::vector::iterator i; + ResetExtent(); + std::vector::const_iterator i; for(i=sel.begin();i!=sel.end()&&valid;++i) { valid= ValidateSelected((*i), @@ -433,7 +469,7 @@ namespace creaImageIO //================================================== ///Reads Images (Threaded) - void WxGimmickView::ReadImageThreaded(std::vector sel) + void WxGimmickView::ReadImageThreaded(const std::vector& sel) { GimmickDebugMessage(5, "ReadImageThreaded" @@ -447,7 +483,7 @@ namespace creaImageIO 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, @@ -537,7 +573,7 @@ namespace creaImageIO pointers.push_back(new ImagePointerHolder(GetDefaultImage())); mViewer->SetImageVector(pointers); mViewer->RefreshIfNecessary(); - ClearStatus(); + ResetExtent(); } //================================================= @@ -545,9 +581,10 @@ 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(); } //================================================= @@ -558,7 +595,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(), @@ -599,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); + } + } + + } //================================================= @@ -608,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() //=================================================