X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxGimmickView.cpp;h=7594cbef3bcda45fc83ad4ee44106988c3ff7de1;hb=479c2e4dff23a83d55d78a3f6f4887c85e88bf3b;hp=7e79bc320c94b25983120a56ab82a33f1c660b6c;hpb=ba6e0d962a85043a44aa79edb5bfb2f146e288d0;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 7e79bc3..7594cbe 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -19,7 +19,7 @@ namespace creaImageIO // The ids of the different tools enum { - TOOL_ADDFILE_ID = 1, + TOOL_ADDFILES_ID = 1, TOOL_ADDDIR_ID = 2, TOOL_REMOVE_ID = 3, TOOL_ADDDATABASE_ID = 4, @@ -61,13 +61,22 @@ namespace creaImageIO wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, - int image_type, + int min_dim, + int max_dim, int number_of_threads) : wxPanel(parent,id,pos,size), - GimmickView(gimmick) + GimmickView(gimmick), + mProgressDialog(0) { GimmickDebugMessage(1,"WxGimmickView::WxGimmickView" <GetHomeDirectory()); + + // Connect the AddProgress callback + gimmick->ConnectAddProgressObserver + ( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) ); + // Create the list of icons (mIcon) CreateIconList(); @@ -90,15 +99,19 @@ namespace creaImageIO //Gimmick mGimmick=gimmick; + mSelectionMaxDimension=max_dim; + mSelectionMinDimension=min_dim; + // Create the views CreateTreeViews(); // Bottom panel mBottomPanel = new wxPanel(mSplitter,-1); - + mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Status: Welcome to Gimmick!")); + // Splitting int hsize = size.GetHeight(); - int bottom_minsize = 200; + int bottom_minsize = 20; mSplitter->SetMinimumPaneSize( bottom_minsize ); mSplitter->SplitHorizontally( mNotebook, mBottomPanel, @@ -131,10 +144,10 @@ namespace creaImageIO mToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize, style); - mToolAddFile = mToolBar->AddTool( TOOL_ADDFILE_ID, + mToolAddFile = mToolBar->AddTool( TOOL_ADDFILES_ID, _T("Add file(s)"), mIcon->GetBitmap(Icon_page_down), - _T("Add some file(s) to database") + _T("Add one or more file to database") ); mToolAddDir = mToolBar->AddTool( TOOL_ADDDIR_ID, _T("Add folder"), @@ -172,6 +185,9 @@ namespace creaImageIO name<<"'"<SetMaxDimension(mSelectionMaxDimension); + view->SetMinDimension(mSelectionMinDimension); // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT // ALREADY IN THE MAP @@ -182,8 +198,18 @@ namespace creaImageIO } //====================================================================== + /// Returns the selected Image so that it complies with the given parameter(<4D) + vtkImageData* WxGimmickView::GetSelectedImage(int dim) + { + return 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) + { + GetTreeViewMap()["Local database"]->GetSelectedImages(s,dim); + } //================================================= void WxGimmickView::CreateIconList() @@ -219,23 +245,25 @@ namespace creaImageIO } } } + //================================================= //================================================= - void WxGimmickView::OnAddFile(wxCommandEvent& event) + void WxGimmickView::OnAddFiles(wxCommandEvent& event) { long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE; std::string wc("*.*"); wxFileDialog* FD = new wxFileDialog( 0, _T("Select file"), - "", _T(""), - std2wx(wc), + _T(""), + crea::std2wx(wc), style, wxDefaultPosition); if (FD->ShowModal()==wxID_OK) { + wxBusyCursor busy; wxArrayString files; FD->GetPaths(files); @@ -247,38 +275,153 @@ namespace creaImageIO GimmickMessage(2,"Adding File "<GetItemData(mItemOfMenu); - DicomDatabase* db = data->GetDicomNode()->GetDicomDatabase(); - DicomDatabase::UpdateSummary summary; - wxProgressDialog* progress = + mProgressDialog = new wxProgressDialog(_T("Adding file(s)"), _T(""), 1000, this, wxPD_ELAPSED_TIME | - wxPD_ESTIMATED_TIME | - wxPD_REMAINING_TIME | + // wxPD_ESTIMATED_TIME | + // wxPD_REMAINING_TIME | wxPD_CAN_ABORT ); + + // TO DO : select the current tree handler + mGimmick->AddFiles("Local database",filenames); + + mProgressDialog->Pulse(_T("Updating view...")); + + UpdateTreeViewLevel("Local database",1); + delete mProgressDialog; + DisplayAddSummary(); + } + + } + //================================================= + + //================================================= + void WxGimmickView::OnAddDir(wxCommandEvent& event) + { + long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; + wxDirDialog* FD = + new wxDirDialog( 0, + _T("Select directory"), + mCurrentDirectory, + style); + + if (FD->ShowModal()==wxID_OK) + { + + bool recurse = false; + if (wxMessageBox(_T("Recurse into sub-directories ?"), + _T("Scan directory"), + wxYES_NO,this ) == wxYES) + { + recurse = true; + } - db->AddFiles(filenames,progress,summary); + 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(); - progress->Pulse(_T("Updating view...")); - UpdateDicomDatabaseView(db); - delete progress; - DisplayUpdateSummary(summary,this); - */ - } + // 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(); + } + } + //================================================= + + //================================================= + void WxGimmickView::SetMessage(const wxString& mess) + { + wxBusyCursor busy; + + mText->SetLabel(_T("Status: ")+mess); + } + //================================================= + + //================================================= + void WxGimmickView::OnRemove(wxCommandEvent& event) + { + //TODO Select current tree handler + wxBusyCursor busy; + GetTreeViewMap()["Local database"]->RemoveSelected(1); } //================================================= + //================================================= + /// AddProgress Gimmick callback + void WxGimmickView::OnAddProgress( Gimmick::AddProgress& p) + { + + char mess[200]; + sprintf(mess,"%i dirs - %i files - %i handled - %i added", + p.GetNumberScannedDirs(), + p.GetNumberScannedFiles(), + p.GetNumberHandledFiles(), + p.GetNumberAddedFiles()); + // std::cout << "OnAddProgress "<Pulse(s)) + { + p.SetStop(); + } + // std::cout << "OnAddProgress ok"<GetAddProgress(); + std::stringstream mess; + mess << "Dirs \tscanned\t: " << p.GetNumberScannedDirs() << "\n"; + mess << "Files\tscanned\t: " << p.GetNumberScannedFiles() << "\n"; + mess << "Files\thandled\t: " << p.GetNumberHandledFiles() << "\n\n"; + mess << "Files\tadded \t: " << p.GetNumberAddedFiles() << "\n\n"; + + /* char times[500]; + sprintf(times,"Time to parse dir \t\t: %ld ms \t%d°/o\nTime to read files info \t: %ld ms \t%d°/o\nTime to update structs \t: %ld ms \t%d°/o\nTime to update database \t: %ld ms \t%d°/o\nTotal time \t\t\t: %ld ms", + summary.parse_time, + (int)( summary.parse_time*100./summary.total_time), + summary.file_scan_time, + (int)(summary.file_scan_time*100./summary.total_time), + summary.update_structs_time, + (int)(summary.update_structs_time*100./summary.total_time), + summary.update_database_time, + (int)(summary.update_database_time*100./summary.total_time), + summary.total_time ); + + mess << times; + */ + wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this); + } + //================================================= + + //================================================= BEGIN_EVENT_TABLE(WxGimmickView, wxPanel) - EVT_TOOL(TOOL_ADDFILE_ID, WxGimmickView::OnAddFile) + EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles) + EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir) + EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove) END_EVENT_TABLE() + //================================================= } // EO namespace creaImageIO