X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=cec329ba94ba9d9bc30c8651f121d8255b627930;hb=bfede4f2084492a14d5d7c68f7d1a60d91865236;hp=c30f96ca9918629c107f1f892a16f13e6abec725;hpb=79be5edd158476cd0f21d3146223594234ef06fc;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index c30f96c..cec329b 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1,16 +1,15 @@ #include #include #include - +using namespace crea; // Icons -#include "../src/icons/database.xpm" -#include "../src/icons/folder.xpm" -#include "../src/icons/dicomdir.xpm" -#include "../src/icons/patient.xpm" -#include "../src/icons/study.xpm" -#include "../src/icons/series.xpm" -#include "../src/icons/image.xpm" -#include "../src/icons/root.xpm" +#include "icons/accept.xpm" +#include "icons/add.xpm" +#include "icons/folder-down.xpm" +#include "icons/page-down.xpm" +#include "icons/remove.xpm" +#include "icons/database-add.xpm" +#include "icons/help.xpm" #include @@ -20,24 +19,27 @@ 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, + TOOL_HELP_ID = 5 }; //====================================================================== //================================================================ // - const int icon_number = 8; + const int icon_number = 7; // Icon ids typedef enum { - Icon_Root, - Icon_Database, - Icon_Folder, - Icon_DicomDir, - Icon_Patient, - Icon_Study, - Icon_Series, - Icon_Image + Icon_accept, + Icon_add, + Icon_folder_down, + Icon_page_down, + Icon_remove, + Icon_database_add, + Icon_help } icon_id; //================================================================ @@ -59,13 +61,23 @@ namespace creaImageIO wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, - int image_type, + int min_dim, + int max_dim, + int out_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(); @@ -85,6 +97,13 @@ namespace creaImageIO mNotebook = new wxNotebook(mSplitter, -1,wxDefaultPosition, wxDefaultSize, 0); + //Gimmick + mGimmick=gimmick; + + mSelectionMaxDimension=max_dim; + mSelectionMinDimension=min_dim; + mOutputDimension=out_dim; + // Create the views CreateTreeViews(); @@ -95,7 +114,7 @@ namespace creaImageIO int hsize = size.GetHeight(); int bottom_minsize = 200; - mSplitter->SetMinimumPaneSize( viewsminsize ); + mSplitter->SetMinimumPaneSize( bottom_minsize ); mSplitter->SplitHorizontally( mNotebook, mBottomPanel, hsize - bottom_minsize); @@ -122,14 +141,34 @@ namespace creaImageIO /// Creates the tool bar void WxGimmickView::CreateToolBar() { - long style = wxTB_HORIZONTAL | wxNO_BORDER; + long style = wxTB_HORIZONTAL | wxNO_BORDER | wxTB_TEXT; mToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize, style); - mToolAddFile = mToolBar->AddTool( TOOL_ADDFILE_ID, - _T("Add file"), - mIcon->GetBitmap(Icon_Database), - _T("Add file") + mToolAddFile = mToolBar->AddTool( TOOL_ADDFILES_ID, + _T("Add file(s)"), + mIcon->GetBitmap(Icon_page_down), + _T("Add one or more file to database") + ); + mToolAddDir = mToolBar->AddTool( TOOL_ADDDIR_ID, + _T("Add folder"), + mIcon->GetBitmap(Icon_folder_down), + _T("Add the content of a folder to database") + ); + mToolRemove = mToolBar->AddTool( TOOL_REMOVE_ID, + _T("Remove"), + mIcon->GetBitmap(Icon_remove), + _T("Remove selected items") + ); + mToolAddDatabase = mToolBar->AddTool( TOOL_ADDDATABASE_ID, + _T("Open database"), + mIcon->GetBitmap(Icon_database_add), + _T("Open a local or distant database") + ); + mToolHelp = mToolBar->AddTool( TOOL_HELP_ID, + _T("Help"), + mIcon->GetBitmap(Icon_help), + _T("Open help window") ); //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL) @@ -147,6 +186,10 @@ namespace creaImageIO name<<"'"<SetMaxDimension(mSelectionMaxDimension); + view->SetMinDimension(mSelectionMinDimension); + view->SetOutputDimension(mOutputDimension); // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT // ALREADY IN THE MAP @@ -157,33 +200,45 @@ namespace creaImageIO } //====================================================================== + /// Returns the selected Images so that they comply with the given parameter(<4D) + vtkImageData* WxGimmickView::GetSelectedImage(int dim) + { + return NULL; + } - + //====================================================================== + /// Returns the selected Images so that they comply with the given parameter(4D) + void WxGimmickView::GetSelectedImages(std::vector& s, int dim) + { + + //GetTreeViewMap()["Local database"]->GetImageData() + //return NULL ; + + } //================================================= void WxGimmickView::CreateIconList() { // Size of the icons; - int size = 32; + int size = 24; wxIcon icons[20]; // should correspond to Icon_xxx enum - icons[Icon_Patient] = wxIcon(patient_xpm); - icons[Icon_Study] = wxIcon(study_xpm); - icons[Icon_Series] = wxIcon(series_xpm); - icons[Icon_Image] = wxIcon(image_xpm); - icons[Icon_Database] = wxIcon(database_xpm); - icons[Icon_Folder] = wxIcon(folder_xpm); - icons[Icon_DicomDir] = wxIcon(dicomdir_xpm); - icons[Icon_Root] = wxIcon(root_xpm); - - unsigned int NbIcons = 8; + icons[Icon_accept] = wxIcon(accept_xpm); + icons[Icon_add] = wxIcon(add_xpm); + icons[Icon_folder_down] = wxIcon(folder_down_xpm); + icons[Icon_page_down] = wxIcon(page_down_xpm); + icons[Icon_remove] = wxIcon(remove_xpm); + icons[Icon_database_add] = wxIcon(database_add_xpm); + icons[Icon_help] = wxIcon(help_xpm); + + // unsigned int NbIcons = 8; // Make an image list containing small icons mIcon = new wxImageList(size,size,true); // Make all icons the same size = size of the first one int sizeOrig = icons[0].GetWidth(); - for ( size_t i = 0; i < NbIcons; i++ ) + for ( size_t i = 0; i < icon_number; i++ ) { if ( size == sizeOrig ) { @@ -198,6 +253,171 @@ namespace creaImageIO //================================================= + //================================================= + 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(""), + _T(""), + crea::std2wx(wc), + style, + wxDefaultPosition); + + if (FD->ShowModal()==wxID_OK) + { + wxBusyCursor busy; + + wxArrayString files; + FD->GetPaths(files); + unsigned int i; + std::vector filenames; + for (i=0;iAddFiles("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; + } + + 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(); + } + } + //================================================= + + //================================================= + 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_ADDFILES_ID, WxGimmickView::OnAddFiles) + EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir) + EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove) + END_EVENT_TABLE() + //================================================= } // EO namespace creaImageIO