// Includes
//------------------------------------------------------------------------------------------------------------
-#include "wxContour_ActionCommnadsID.h"
+#include "wxContour_ActionCommandsID.h"
#include "NameWrapper.h"
#include "ConceptDataWrap.h"
#include "OutlineGroup.h"
inundo = 0;
inredo = 0;
stundoredo = "data/temp";
+#if(WIN32)
+ mkdir(stundoredo.c_str());
+#else
mkdir(stundoredo.c_str(),755);
+#endif
stundoredo += "/cont";
}
//------------------------------------------------------------------------------------------------------------
std::vector<int> tempVector;
_instantPanel->getInstant( tempVector );
_performingOperation->reset();
- _performingOperation->setStartCommand( (char)wxContour_ActionCommnadsID::COPY_TOOL );
+ _performingOperation->setStartCommand( (char)wxContour_ActionCommandsID::COPY_TOOL );
_performingOperation->setStartOperationInstantVector( tempVector );
_performingOperation->setKeyNamesOperationElems( keyNamesVector );
void wxContourEventHandler :: onPasteOutlines( )
{
char theStartCommand = _performingOperation->getStartCommand();
- if ( theStartCommand == wxContour_ActionCommnadsID::COPY_TOOL )
+ if ( theStartCommand == wxContour_ActionCommandsID::COPY_TOOL )
{
//JCP 20-10-08 Undo redo implementation
saveState();
{
std::vector<std::string> currentSelection = _sceneManager->getSelectedObjects();
int elementsSelected = currentSelection.size();
- if( toolCommand == (wxContour_ActionCommnadsID::CREATE_TOOL) )
+ if( toolCommand == (wxContour_ActionCommandsID::CREATE_TOOL) )
{
onCreateContourFrame();
}
- if( toolCommand == (wxContour_ActionCommnadsID::CREATE_CONTOUR_KEY) )
+ if( toolCommand == (wxContour_ActionCommandsID::CREATE_CONTOUR_KEY) )
{
createContour();
}
- else if( toolCommand == wxContour_ActionCommnadsID::DELETE_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::DELETE_TOOL )
{
onDeleteFrame( );
}
- else if( toolCommand == wxContour_ActionCommnadsID::DELETE_KEY )
+ else if( toolCommand == wxContour_ActionCommandsID::DELETE_KEY )
{
deleteContours( currentSelection );
}
- else if( toolCommand == wxContour_ActionCommnadsID::SAVE_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::SAVE_TOOL )
{
saveFileWithContours( );
}
- else if( toolCommand == wxContour_ActionCommnadsID::SAVE_KEY )
+ else if( toolCommand == wxContour_ActionCommandsID::SAVE_KEY )
{
saveFileWithContoursAutomatique( );
}
- else if( toolCommand == wxContour_ActionCommnadsID::OPEN_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::OPEN_TOOL )
{
openFileWithContours( );
}
- else if( toolCommand == wxContour_ActionCommnadsID::CHANGE_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::CHANGE_TOOL )
{
if ( elementsSelected >= 1 )
{
}
}
- else if( toolCommand == wxContour_ActionCommnadsID::HIDE_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::HIDE_TOOL )
{
if ( elementsSelected >= 1 )
{
onHideOutlines( currentSelection );
}
}
- else if( toolCommand == wxContour_ActionCommnadsID::SHOW_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::SHOW_TOOL )
{
if ( elementsSelected >= 1 )
{
onShowOutlines( currentSelection );
}
}
- else if( toolCommand == wxContour_ActionCommnadsID::COPY_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::COPY_TOOL )
{
if ( elementsSelected >= 1 )
{
onCopyOutlines( currentSelection );
}
}
- else if( toolCommand == wxContour_ActionCommnadsID::PASTE_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::PASTE_TOOL )
{
onPasteOutlines( );
}
- else if( toolCommand == wxContour_ActionCommnadsID::SPREAD_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::SPREAD_TOOL )
{
onSpread();
}
- else if( toolCommand == wxContour_ActionCommnadsID::AUTOMATIQUESEGMENTATION_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::AUTOMATIQUESEGMENTATION_TOOL )
{
onAutomatiqueSegmentation( );
}
- else if( toolCommand == wxContour_ActionCommnadsID::SELECT_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::SELECT_TOOL )
{
onSelectOutlines( currentSelection );
}
- else if( toolCommand == wxContour_ActionCommnadsID::EDIT_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::EDIT_TOOL )
{
if ( elementsSelected >= 1 )
{
onEditOutlines( currentSelection );
}
}
- else if( toolCommand == wxContour_ActionCommnadsID::UNDO_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::UNDO_TOOL )
{
onUNDO();
}
- else if( toolCommand == wxContour_ActionCommnadsID::REDO_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::REDO_TOOL )
{
onREDO();
}
- else if( toolCommand == wxContour_ActionCommnadsID::INFORMATIONCONTOUR_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::INFORMATIONCONTOUR_TOOL )
{
onInformationContourFrame();
}
- else if( toolCommand == wxContour_ActionCommnadsID::INTERFACECONFIGURATION_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::INTERFACECONFIGURATION_TOOL )
{
onInterfaceConfigurationFrame();
}
- else if( toolCommand == wxContour_ActionCommnadsID::TEST_TOOL )
+ else if( toolCommand == wxContour_ActionCommandsID::TEST_TOOL )
{
onInterfaceTestFrame();
}
//------------------------------------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------------------------------------
-#include "wxContour_ActionCommnadsID.h"
+#include "wxContour_ActionCommandsID.h"
#include "wx/toolbar.h"
#include "wx/log.h"
:wxPanel( parent, id)//, pos, size, style, name)
{
//SetToolBitmapSize(wxSize(16,16));
- std::string as = (char)wxContour_ActionCommnadsID::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 );
- as = (char)wxContour_ActionCommnadsID::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 );
/*
- _hideContour_Button = new wxButton( this, -1, "Hide Contour", wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::HIDE_TOOL );
+ _hideContour_Button = new wxButton( this, -1, "Hide Contour", wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::HIDE_TOOL );
Connect( _hideContour_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed );
- _show_Button = new wxButton( this, -1, _T("Show"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SHOW_TOOL );
+ _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 );
*/
- as = (char)wxContour_ActionCommnadsID::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 );
- as = (char)wxContour_ActionCommnadsID::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 );
- as = (char)wxContour_ActionCommnadsID::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 );
- as = (char)wxContour_ActionCommnadsID::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 );
- as = (char)wxContour_ActionCommnadsID::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 );
- as = (char)wxContour_ActionCommnadsID::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 );
- as = (char)wxContour_ActionCommnadsID::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 );
- as = (char)wxContour_ActionCommnadsID::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 );
- as = (char)wxContour_ActionCommnadsID::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
- as = (char)wxContour_ActionCommnadsID::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 );
/*
- _spread_Button = new wxButton( this, -1, _T("Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SPREAD_TOOL );
+ _spread_Button = new wxButton( this, -1, _T("Spread"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SPREAD_TOOL );
Connect( _spread_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed );
- _select_Button = new wxButton( this, -1, _T("Select"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::SELECT_TOOL );
+ _select_Button = new wxButton( this, -1, _T("Select"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::SELECT_TOOL );
Connect( _select_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed );
- _edit_Button = new wxButton( this, -1, _T("Edit"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::EDIT_TOOL );
+ _edit_Button = new wxButton( this, -1, _T("Edit"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::EDIT_TOOL );
Connect( _edit_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed );
- _undo_Button = new wxButton( this, -1, _T("Undo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::UNDO_TOOL );
+ _undo_Button = new wxButton( this, -1, _T("Undo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::UNDO_TOOL );
Connect( _undo_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed );
- _redo_Button = new wxButton( this, -1, _T("Redo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommnadsID::REDO_TOOL );
+ _redo_Button = new wxButton( this, -1, _T("Redo"), wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator, wxContour_ActionCommandsID::REDO_TOOL );
Connect( _redo_Button->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContour_ButtonsBar:: onActionButtonPressed );
*/
wxFlexGridSizer * panelSizer = new wxFlexGridSizer(9);