X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=b445d82955383e73fc4855fe525c3401579f507a;hb=4ac76c07b4bfbdf3c69da3faa347e1f14c7c217c;hp=646782cac0372c4152f63ee5c5ff95235789ad24;hpb=2a9cd3d33877f2490550c2de08452eac220a131c;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 646782c..b445d82 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include using namespace crea; @@ -12,6 +12,8 @@ using namespace crea; #include "icons/create-database.xpm" #include "icons/help.xpm" #include "icons/synchronize.xpm" +#include "icons/settings.xpm" +#include "icons/tools.xpm" #include #include @@ -30,13 +32,15 @@ namespace creaImageIO TOOL_ADDDATABASE_ID = 4, TOOL_REMOVE_ID = 5, TOOL_SYNCHRONIZE_ID = 6, - TOOL_HELP_ID = 7 + TOOL_HELP_ID = 7, + TOOL_SETTINGS_ID = 8, + TOOL_TOOLS_ID = 9 }; //====================================================================== //================================================================ // - const int icon_number = 9; + const int icon_number = 11; // Icon ids typedef enum { @@ -48,7 +52,9 @@ namespace creaImageIO Icon_database_add, Icon_remove, Icon_synchronize, - Icon_help + Icon_help, + Icon_settings, + Icon_tools } icon_id; //================================================================ @@ -214,6 +220,16 @@ namespace creaImageIO 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(); @@ -283,6 +299,8 @@ namespace creaImageIO 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 @@ -607,8 +625,15 @@ namespace creaImageIO //================================================= void WxGimmickView::AddIgnoreFile(tree::Node* toRemove) { - mGimmick->RemoveFile("Local database",toRemove); - GetTreeViewMap()["Local database"]->UpdateLevel(1); + 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); } //================================================= @@ -635,14 +660,144 @@ namespace creaImageIO bool checkAttributes=false; if(sel==2 || sel==3){repair=true;} if(sel==1 || sel==3){checkAttributes=true;} - std::string mess=mGimmick->Synchronize(repair, checkAttributes); + std::string mess=mGimmick->Synchronize(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),repair, checkAttributes); wxMessageBox(std2wx(mess),_T("Synchronization result"),wxOK,this); - GetTreeViewMap()["Local database"]->UpdateLevel(1); + 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) @@ -784,6 +939,8 @@ namespace creaImageIO 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() //=================================================