//------------------------------------------------------------------------------------------------------------
// Includes
//------------------------------------------------------------------------------------------------------------
-#include "wxContour_ActionCommnadsID.h"
+#include "wxContour_ActionCommandsID.h"
//------------------------------------------------------------------------------------------------------------
// Generated events declaration and definition
setControlActiveStateOf( _workingGroup, false );
_workingGroup->clear();
}
- std::map <std::string, ContourWrap_ViewControl *>::iterator iter = NULL;
+ std::map <std::string, ContourWrap_ViewControl *>::iterator iter;
//EED Borrame
// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
if ( _lastKeyCode == 3 && ctrlKey ) //'C' || 'c'
{
- toolCommand = &(wxContour_ActionCommnadsID::COPY_TOOL);
+ toolCommand = &(wxContour_ActionCommandsID::COPY_TOOL);
}
else if( _lastKeyCode == 22 && ctrlKey ) //'V' || 'v'
{
- toolCommand = &(wxContour_ActionCommnadsID::PASTE_TOOL);
+ toolCommand = &(wxContour_ActionCommandsID::PASTE_TOOL);
}
else if( _lastKeyCode == 8 || (_lastKeyCode==127) ) // Delete
{
- toolCommand = &(wxContour_ActionCommnadsID::DELETE_KEY);
+ toolCommand = &(wxContour_ActionCommandsID::DELETE_KEY);
}
else if( _lastKeyCode == 14 && ctrlKey ) //'N' || 'n'
{
- toolCommand = &(wxContour_ActionCommnadsID::CREATE_CONTOUR_KEY);
+ toolCommand = &(wxContour_ActionCommandsID::CREATE_CONTOUR_KEY);
}
else if( _lastKeyCode == 15 && ctrlKey ) //'O' || 'o'
{
- toolCommand = &(wxContour_ActionCommnadsID::OPEN_TOOL);
+ toolCommand = &(wxContour_ActionCommandsID::OPEN_TOOL);
}
else if( _lastKeyCode == 19 && ctrlKey ) //'S' || 's'
{
- toolCommand = &(wxContour_ActionCommnadsID::SAVE_KEY);
+ toolCommand = &(wxContour_ActionCommandsID::SAVE_KEY);
}
if ( toolCommand!=NULL )
{
FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
long int start = clock();
+#if(WIN32)
double sg = (double)(start) / (double)CLK_TCK;
+#else
+ double sg = (double)(start) / CLOCKS_PER_SEC;
+#endif
int tmpPx,tmpPy;
wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
wxVTKiren->GetEventPosition( tmpPx , tmpPy );
- fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): \n \n",method, tmpPx, tmpPy, sg);
+ fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): \n \n",method.c_str(), tmpPx, tmpPy, sg);
fclose(ff);
}