85%

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxVtkBaseView_SceneManager.cxx

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index c765d330a68f4fcaac7da7258c8ca735f394aac0..dbebb4eccebef8dc1a8742d21580fa26334381e1 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -13,7 +13,7 @@
 //------------------------------------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------------------------------------
-#include "wxContour_ActionCommandsID.h"
+#include "wxContour_ActionCommnadsID.h"
 
 //------------------------------------------------------------------------------------------------------------
 // Generated events declaration and definition
@@ -332,7 +332,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                        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+");
@@ -674,27 +674,27 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
                        if ( _lastKeyCode == 3 && ctrlKey ) //'C' || 'c' 
                        {
-                               toolCommand = &(wxContour_ActionCommandsID::COPY_TOOL);
+                               toolCommand = &(wxContour_ActionCommnadsID::COPY_TOOL);
                        }
                        else if(  _lastKeyCode == 22 && ctrlKey ) //'V' || 'v' 
                        {
-                               toolCommand = &(wxContour_ActionCommandsID::PASTE_TOOL);
+                               toolCommand = &(wxContour_ActionCommnadsID::PASTE_TOOL);
                        }
                        else if(  _lastKeyCode == 8 || (_lastKeyCode==127) ) // Delete 
                        {
-                               toolCommand = &(wxContour_ActionCommandsID::DELETE_KEY);
+                               toolCommand = &(wxContour_ActionCommnadsID::DELETE_KEY);
                        }
                        else if(  _lastKeyCode == 14 && ctrlKey ) //'N' || 'n' 
                        {
-                               toolCommand = &(wxContour_ActionCommandsID::CREATE_CONTOUR_KEY);
+                               toolCommand = &(wxContour_ActionCommnadsID::CREATE_CONTOUR_KEY);
                        }
                        else if(  _lastKeyCode == 15 && ctrlKey ) //'O' || 'o' 
                        {
-                               toolCommand = &(wxContour_ActionCommandsID::OPEN_TOOL);
+                               toolCommand = &(wxContour_ActionCommnadsID::OPEN_TOOL);
                        }
                        else if(  _lastKeyCode == 19 && ctrlKey ) //'S' || 's' 
                        {
-                               toolCommand = &(wxContour_ActionCommandsID::SAVE_KEY);
+                               toolCommand = &(wxContour_ActionCommnadsID::SAVE_KEY);
                        }
 
                        if ( toolCommand!=NULL )
@@ -1092,8 +1092,11 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
        {
                FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
                long int start = clock();
-               //double sg = (double)(start) / (double)CLK_TCK;  // CLK_TCK not ANSI C.
-               double sg = (double)(start) / (double)CLOCKS_PER_SEC;
+#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 );