X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=383fc7995639dc937f70fb1d3fe4757419aa9d91;hb=7c5793ded16fbbcdcb077f70f86dffe846b0f38f;hp=ab12a96d29cc91c288422fe7953b654cc7136ce9;hpb=192dfdf774a06066eff90e9c50916723c8592706;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index ab12a96..383fc79 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -13,7 +13,7 @@
 //------------------------------------------------------------------------------------------------------------
 // Includes
 //------------------------------------------------------------------------------------------------------------
-#include "wxContour_ActionCommnadsID.h"
+#include "wxContour_ActionCommandsID.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_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 )
@@ -1092,11 +1092,15 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	{
 		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);
 	}