X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=b445d82955383e73fc4855fe525c3401579f507a;hb=4ac76c07b4bfbdf3c69da3faa347e1f14c7c217c;hp=ba41e35f13582bb720e92c40cdacdaaa8d2732c7;hpb=76e207a0161dd493be1b96d93d54d35cf3e88422;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index ba41e35..b445d82 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include using namespace crea; @@ -9,9 +9,15 @@ using namespace crea; #include "icons/page-down.xpm" #include "icons/remove.xpm" #include "icons/database-add.xpm" +#include "icons/create-database.xpm" #include "icons/help.xpm" +#include "icons/synchronize.xpm" +#include "icons/settings.xpm" +#include "icons/tools.xpm" #include +#include +#include namespace creaImageIO { @@ -20,27 +26,35 @@ namespace creaImageIO // The ids of the different tools enum { - TOOL_ADDFILES_ID = 1, - TOOL_ADDDIR_ID = 2, - TOOL_REMOVE_ID = 3, - TOOL_ADDDATABASE_ID = 4, - TOOL_HELP_ID = 5 + TOOL_CREATEDB_ID = 1, + TOOL_ADDFILES_ID = 2, + TOOL_ADDDIR_ID = 3, + TOOL_ADDDATABASE_ID = 4, + TOOL_REMOVE_ID = 5, + TOOL_SYNCHRONIZE_ID = 6, + TOOL_HELP_ID = 7, + TOOL_SETTINGS_ID = 8, + TOOL_TOOLS_ID = 9 }; //====================================================================== //================================================================ // - const int icon_number = 7; + const int icon_number = 11; // Icon ids typedef enum { + Icon_create_database, Icon_accept, Icon_add, Icon_folder_down, Icon_page_down, + Icon_database_add, Icon_remove, - Icon_database_add, - Icon_help + Icon_synchronize, + Icon_help, + Icon_settings, + Icon_tools } icon_id; //================================================================ @@ -156,6 +170,8 @@ namespace creaImageIO /// Destructor WxGimmickView::~WxGimmickView() { + // stop the viewer before application exit. + mViewer->StopPlayer(); GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <AddTool( TOOL_CREATEDB_ID, + _T("Create database"), + mIcon->GetBitmap(Icon_create_database), + _T("Create DB from an Attributes Descriptor file") + ); mToolAddFile = mToolBar->AddTool( TOOL_ADDFILES_ID, _T("Add file(s)"), mIcon->GetBitmap(Icon_page_down), @@ -179,21 +200,36 @@ namespace creaImageIO mIcon->GetBitmap(Icon_folder_down), _T("Add the content of a folder to database") ); + mToolAddDatabase = mToolBar->AddTool( TOOL_ADDDATABASE_ID, + _T("Open database"), + mIcon->GetBitmap(Icon_database_add), + _T("Open a local or distant 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") + mToolSynchronize = mToolBar->AddTool( TOOL_SYNCHRONIZE_ID, + _T("Synchronize"), + mIcon->GetBitmap(Icon_synchronize), + _T("Synchronizes the database with disk") ); - mToolHelp = mToolBar->AddTool( TOOL_HELP_ID, + mToolHelp = mToolBar->AddTool( TOOL_HELP_ID, _T("Help"), mIcon->GetBitmap(Icon_help), _T("Open help window") ); + mToolSettings = mToolBar->AddTool( TOOL_SETTINGS_ID, + _T("System settings"), + mIcon->GetBitmap(Icon_settings), + _T("Allows the modification of various system settings") + ); + mToolTools = mToolBar->AddTool( TOOL_TOOLS_ID, + _T("Tools"), + mIcon->GetBitmap(Icon_tools), + _T("Applies tools to images") + ); //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL) mToolBar->Realize(); @@ -217,28 +253,40 @@ namespace creaImageIO // Add Notebook page mNotebook->AddPage( view, crea::std2wx(name) ); - + } //====================================================================== - /// 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()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->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); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->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 +297,10 @@ 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); + icons[Icon_create_database] = wxIcon(create_database_xpm); + icons[Icon_settings] = wxIcon(settings_xpm); + icons[Icon_tools] = wxIcon(tools_xpm); // unsigned int NbIcons = 8; // Make an image list containing small icons @@ -274,6 +326,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 +362,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,59 +389,77 @@ 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, bool isSelection, int selection, bool needProcess) + void WxGimmickView::OnSelectionChange(const std::vector& sel, bool isSelection, int selection, bool needProcess) { GimmickDebugMessage(5, "WxGimmickView::OnSelectionChange" <::iterator i; + ResetExtent(); + std::vector::const_iterator i; for(i=sel.begin();i!=sel.end()&&valid;++i) { valid= ValidateSelected((*i), @@ -401,8 +475,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), @@ -410,8 +484,7 @@ namespace creaImageIO mSelectionMaxDimension ); } } - - mText->SetLabel(crea::std2wx(GetMessage())); + mText->SetLabel(crea::std2wx(GetMessage())); /*if(valid) { ReadImageThreaded(sel); @@ -429,7 +502,7 @@ namespace creaImageIO //================================================== ///Reads Images (Threaded) - void WxGimmickView::ReadImageThreaded(std::vector sel) + void WxGimmickView::ReadImageThreaded(const std::vector& sel) { GimmickDebugMessage(5, "ReadImageThreaded" @@ -443,7 +516,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, @@ -461,7 +534,7 @@ namespace creaImageIO //Going up prio = maxprio + 20; std::vector up; - GetTreeViewMap()["Local database"]->GetNodes(up,true); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNodes(up,true); std::vector::iterator iterUp; for(iterUp=up.begin();iterUp!=up.end();++iterUp) { @@ -479,7 +552,7 @@ namespace creaImageIO //Going down prio = maxprio + 19; std::vector down; - GetTreeViewMap()["Local database"]->GetNodes(down,false); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNodes(down,false); std::vector::iterator iterDown; for(iterDown=down.begin();iterDown!=down.end();++iterDown) { @@ -518,7 +591,10 @@ namespace creaImageIO } // GimmickMessage(1,"WxGimmickView : Refresh viewer"<StartPlayer(); - mViewer->RefreshIfNecessary(); + if(mViewer) + { + mViewer->RefreshIfNecessary(); + } } //================================================== @@ -530,7 +606,7 @@ namespace creaImageIO pointers.push_back(new ImagePointerHolder(GetDefaultImage())); mViewer->SetImageVector(pointers); mViewer->RefreshIfNecessary(); - ClearStatus(); + ResetExtent(); } //================================================= @@ -538,20 +614,198 @@ 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()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->RemoveSelected(); ClearSelection(); } //================================================= + + //================================================= + void WxGimmickView::AddIgnoreFile(tree::Node* toRemove) + { + mGimmick->RemoveFile(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),toRemove); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1); + } + + //================================================= + void WxGimmickView::CopyFiles(const std::vector& filenames) + { + mGimmick->CopyFiles(filenames, crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))); + wxMessageBox(std2wx("The selected files have been copied"),_T("Copy files"),wxOK,this); + } + + //================================================= + void WxGimmickView::OnSynchronize(wxCommandEvent& event) + { + wxBusyCursor busy; + const wxString choices[] = { _T("Check database for files deletion and addition and give a report."), + _T("Check database for files deletion, addition and attributes change. Then give a report."), + _T("Repair database (remove deleted files and add new files)."), + _T("Repair database (remove deleted files, add new files and reset changed attributes).") } ; + + wxSingleChoiceDialog dialog(this, + _T("Select one of the following synchronization actions:\n") + _T("Please 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(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),repair, checkAttributes); + wxMessageBox(std2wx(mess),_T("Synchronization result"),wxOK,this); + if(sel==2 || sel==3){ + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1); + } + + } + } + //================================================= + + //================================================= + void WxGimmickView::OnSettings(wxCommandEvent& event) + { + wxDialog* dial= new wxDialog (this,-1,_T("System Settings"),wxDefaultPosition, wxSize(450,600)); + wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL); + // Notebook + wxNotebook* nb= new wxNotebook(dial, + -1,wxDefaultPosition, wxDefaultSize, 0); + + siz->Add( nb,1,wxGROW ,0); + CreateSettingsDialog(nb); + dial->SetSizer(siz); + dial->ShowModal(); + } + //================================================= + + //================================================= + //AndresDonadio + void WxGimmickView::OnTools(wxCommandEvent& event) + { + mViewer->StopPlayer(); + + wxDialog* dial= new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,200)); + + + WxGimmickTools * gimmickTools = new WxGimmickTools(dial, mCurrentDirectory); + + wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); + + + wxSizer* bsizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); + topsizer->Add(gimmickTools,1,wxGROW,0); + topsizer->Add(bsizer,0,wxGROW); + + dial->SetSizer(topsizer, true); + dial->Layout(); + dial->ShowModal(); + + if (dial->GetReturnCode() == wxID_OK) + { + wxString inputDir = gimmickTools->getInputDir(); + wxString outputDir = gimmickTools->getOutputDir(); + bool addToDB = gimmickTools->getCheckBoxValue(); +/* + Bruker2Dicom b2d; + b2d.SetInputDirectory(crea::wx2std(inputDir)); + b2d.SetOutputDirectory(crea::wx2std(outputDir)); + b2d.SetConvertModeToDicom(); + b2d.Execute(); +*/ + if (addToDB) + { + mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT ); + mCurrentDirectory = outputDir; + mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),crea::wx2std(outputDir),true); + mProgressDialog->Pulse(_T("Updating view...")); + + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); + delete mProgressDialog; + DisplayAddSummary(); + } + } + + mViewer->StartPlayer(); + + /* + + std::string name = crea::wx2std(mNotebook->GetCurrentPage()->GetName()); + long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; + wxDirDialog* FD = new wxDirDialog( 0, _T("Select directory"), mCurrentDirectory, style); + + if (FD->ShowModal()==wxID_OK) + { + + + 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(); + + } + + */ + } + //================================================= + + void WxGimmickView::CreateSettingsDialog(wxNotebook* nb) + { + //First page: Customization of configurations + wxPanel* customConfig=new wxPanel(nb); + nb->AddPage( customConfig, crea::std2wx("Customize Configuration") ); + //Second page: Creation of Databases + wxPanel* databaseCreation=new wxPanel(nb); + nb->AddPage( databaseCreation, crea::std2wx("Create Database") ); + //Third page: CD/DVD Watch + wxPanel* cdWatch=new wxPanel(nb); + nb->AddPage( cdWatch, crea::std2wx("CD/DVD") ); + //Fourth page: Selection of attributes to show (edit) + wxPanel* attSelection=new wxPanel(nb); + nb->AddPage( attSelection, crea::std2wx("Selection of Attributes") ); + + } + + //================================================= /// AddProgress Gimmick callback void WxGimmickView::OnAddProgress( Gimmick::AddProgress& p) { 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(), @@ -594,13 +848,99 @@ namespace creaImageIO 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++) + { + //get name of DB (file name) + size_t pos = files[i].find_last_of(_T("\\")); + std::string name = crea::wx2std(files[i].substr(pos+1)); + pos = name.find_last_of("."); + name = name.substr(0,pos); + //create TreeHandler + mGimmick->addDB(name, crea::wx2std(files[i])); + //create TreeView + CreateSingleTreeView(name); + } + } + } + //////////////////////////////////////////////////// + // Create a DB from an Attributes Descriptor files // + // @param event : WxEvent // + // @return : - // + ////////////////////////////////////////////////// + void WxGimmickView::OnCreateDB(wxCommandEvent& event) + { + + //Select DB + long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; + std::string wc("*.txt"); + wxFileDialog* FD = new wxFileDialog( 0, + _T("Select file"), + _T(""), + _T(""), + crea::std2wx(wc), + style, + wxDefaultPosition); + + if (FD->ShowModal()==wxID_OK) + { + wxBusyCursor busy; + wxArrayString afile; + FD->GetPaths(afile); + //get name of DB (file name) + std::string file = crea::wx2std(afile[0]); + size_t pos = file.find_last_of("\\"); + std::string name = file.substr(pos+1); + std::string directory = file.substr(0,pos); + pos = name.find_last_of("."); + name = name.substr(0,pos); + //get directory to store DB + directory += "\\" + name + ".sqlite3"; + //create createDB + mGimmick->createDB(name, file,directory); + //create TreeHandler + mGimmick->addDB(name, directory); + //create TreeView + CreateSingleTreeView(name); + } + } + //================================================= //================================================= BEGIN_EVENT_TABLE(WxGimmickView, wxPanel) + EVT_TOOL(TOOL_CREATEDB_ID, WxGimmickView::OnCreateDB) EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles) EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir) + EVT_TOOL(TOOL_ADDDATABASE_ID, WxGimmickView::OnAddDB) EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove) + EVT_TOOL(TOOL_SYNCHRONIZE_ID, WxGimmickView::OnSynchronize) + EVT_TOOL(TOOL_SETTINGS_ID, WxGimmickView::OnSettings) + EVT_TOOL(TOOL_TOOLS_ID, WxGimmickView::OnTools) END_EVENT_TABLE() //=================================================