X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContour_ButtonsBar.cxx;h=f000243474711f9c0bbe397498e30348d87d9e93;hb=28ef036731a2758d1c2efcf4de582d063b4129ec;hp=a305d1dc206e74f38bf393d67334ccc59e122ddf;hpb=23633c5496dd702cc9b332468f5daba67d608aca;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx b/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx index a305d1d..f000243 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.cxx @@ -21,7 +21,7 @@ #include "wx/filedlg.h" #include "wx/spinctrl.h" #include "wx/srchctrl.h" - +#include //------------------------------------------------------------------------------------------------------------ // Generated events declaration and definition //------------------------------------------------------------------------------------------------------------ @@ -35,20 +35,13 @@ :wxPanel( parent, id)//, pos, size, style, name) { //SetToolBitmapSize(wxSize(16,16)); - - _createContour_Button = new wxButton( this, - -1, - _T("+ New Contour"), - wxDefaultPosition, - wxDefaultSize, - 0, - wxDefaultValidator, - wxContour_ActionCommandsID::CREATE_TOOL ); - + std::string as = (char)wxContour_ActionCommandsID::CREATE_TOOL +""; + _createContour_Button = new wxButton( this, -1, _T("+ New Contour"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _createContour_Button->SetToolTip(_T("CTRL-N")); Connect( _createContour_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _delete_Button = new wxButton( this, -1, _T("+ Delete"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::DELETE_TOOL ); + as = (char)wxContour_ActionCommandsID::DELETE_TOOL +""; + _delete_Button = new wxButton( this, -1, _T("+ Delete"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _delete_Button->SetToolTip(_T("BACK SPACE or DELETE key")); Connect( _delete_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); @@ -59,47 +52,55 @@ _show_Button = new wxButton( this, -1, _T("Show"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SHOW_TOOL ); Connect( _show_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); */ - _copy_Button = new wxButton( this, -1, _T("Copy"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::COPY_TOOL ); + as = (char)wxContour_ActionCommandsID::COPY_TOOL +""; + _copy_Button = new wxButton( this, -1, _T("Copy"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _copy_Button->SetToolTip(_T("CTRL-C")); Connect( _copy_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _paste_Button = new wxButton( this, -1, _T("Paste"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::PASTE_TOOL ); + as = (char)wxContour_ActionCommandsID::PASTE_TOOL +""; + _paste_Button = new wxButton( this, -1, _T("Paste"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _paste_Button->SetToolTip(_T("CTRL-V")); Connect( _paste_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _change_Button = new wxButton( this, -1, _T(" <--> "), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::CHANGE_TOOL ); + as = (char)wxContour_ActionCommandsID::CHANGE_TOOL +""; + _change_Button = new wxButton( this, -1, _T(" <--> "), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _change_Button->SetToolTip(_T("CTRL-K")); Connect( _change_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _save_Button = new wxButton( this, -1, _T("Save"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::SAVE_TOOL ); + as = (char)wxContour_ActionCommandsID::SAVE_TOOL +""; + _save_Button = new wxButton( this, -1, _T("Save"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _save_Button->SetToolTip(_T("CTRL-S")); Connect( _save_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _open_Button = new wxButton( this, -1, _T("Open"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxContour_ActionCommandsID::OPEN_TOOL ); + as = (char)wxContour_ActionCommandsID::OPEN_TOOL +""; + _open_Button = new wxButton( this, -1, _T("Open"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); _open_Button->SetToolTip(_T("CTRL-O")); Connect( _open_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - - _spread_Button = new wxButton( this, -1, _T("+ Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SPREAD_TOOL ); + as = (char)wxContour_ActionCommandsID::SPREAD_TOOL +""; + _spread_Button = new wxButton( this, -1, _T("+ Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _spread_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _spread_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _automatiqueSegmentation_Button = new wxButton( this, -1, _T("+ Segmentation"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::AUTOMATIQUESEGMENTATION_TOOL ); + as = (char)wxContour_ActionCommandsID::AUTOMATIQUESEGMENTATION_TOOL +""; + _automatiqueSegmentation_Button = new wxButton( this, -1, _T("+ Segmentation"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _automatiqueSegmentation_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _automatiqueSegmentation_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - - _informationContour_Button = new wxButton( this, -1, _T("+ Information"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::INFORMATIONCONTOUR_TOOL ); + as = (char)wxContour_ActionCommandsID::INFORMATIONCONTOUR_TOOL +""; + _informationContour_Button = new wxButton( this, -1, _T("+ Information"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _informationContour_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _informationContour_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); - _interfaceConfiguration_Button = new wxButton( this, -1, _T("+ Configuration"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::INTERFACECONFIGURATION_TOOL ); + as = (char)wxContour_ActionCommandsID::INTERFACECONFIGURATION_TOOL +""; + _interfaceConfiguration_Button = new wxButton( this, -1, _T("+ Configuration"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _informationContour_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _interfaceConfiguration_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed ); //Test button Methods A-B-C in Juan Carlos Prieto 22-09-08 - _interfaceTest_Button = new wxButton( this, -1, _T("+ Test"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::TEST_TOOL ); + as = (char)wxContour_ActionCommandsID::TEST_TOOL +""; + _interfaceTest_Button = new wxButton( this, -1, _T("+ Test"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxString(as.c_str(),wxConvUTF8)); // _informationContour_Button->SetToolTip(_T("CTRL-XXXXXXX")); Connect( _interfaceTest_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed );