-#include <creaImageIOWxGimmickView.h>
+#include <creaImageIOWxGimmickView.h>
#include <creaImageIOWxTreeView.h>
#include <creaImageIOSystem.h>
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 <wx/imaglist.h>
#include <wx/popupwin.h>
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 = 8;
+ 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_create_database
+ Icon_help,
+ Icon_settings,
+ Icon_tools
}
icon_id;
//================================================================
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();
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
mSelectionMaxDimension );
}
}
-
- mText->SetLabel(crea::std2wx(GetMessage()));
+ mText->SetLabel(crea::std2wx(GetMessage()));
/*if(valid)
{
ReadImageThreaded(sel);
//=================================================
- void WxGimmickView::AddIgnoreFile(const tree::Node* & toRemove)
+ 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<std::string>& filenames)
+ {
+ mGimmick->CopyFiles(filenames, crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())));
+ wxMessageBox(std2wx("The selected files have been copied"),_T("Copy files"),wxOK,this);
}
//=================================================
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,250));
+
+ wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
+ wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0);
+
+ wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL);
+ dialSizer->Add(nb,1,wxGROW,0);
+ dialSizer->Add(buttonsSizer,0,wxGROW);
+
+ //First page: Bruker Image Reader
+ WxGimmickTools * gimmickTools = new WxGimmickTools(nb, mCurrentDirectory);
+ nb->AddPage( gimmickTools, crea::std2wx("Bruker Image Reader") );
+
+ dial->SetSizer(dialSizer, true);
+ dial->Layout();
+ dial->ShowModal();
+
+ if (dial->GetReturnCode() == wxID_OK)
+ {
+ if (nb->GetSelection()==0)//Selection: Bruker Image Reader
+ {
+ std::string inputDir = crea::wx2std(gimmickTools->getInputDir());
+ std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
+ bool addToDB = gimmickTools->getCheckBoxValue();
+
+ if (inputDir.compare("")!=0 && outputDir.compare("")!=0)
+ {
+ /*
+ 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();
+ }
+ }
+
+ else
+ {
+ wxMessageBox(_T("One or both of the directory fields are empty"),_T("Empty Fields"),wxOK,this);
+ }
+ }
+ }
+
+ mViewer->StartPlayer();
+ }
+ //=================================================
+
+ 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)
for(int i = 0; i< files.size(); i++)
{
//get name of DB (file name)
- size_t pos = files[i].find_last_of("\\");
- 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);
+ 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);
}
}
}
//=================================================
BEGIN_EVENT_TABLE(WxGimmickView, wxPanel)
EVT_TOOL(TOOL_CREATEDB_ID, WxGimmickView::OnCreateDB)
- EVT_TOOL(TOOL_ADDFILES_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()
//=================================================
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff