From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Thu, 23 Apr 2009 16:04:02 +0000 (+0000)
Subject: ok
X-Git-Tag: EED.02Oct2009~36
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=72ab80e3e7df86ee48ba709d3b445a404120cc2c;p=creaContours.git

ok
---

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 3990807..abfe141 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -7,7 +7,7 @@
 //#include "OutlineModelManager.h"
 //#include "wxContourEventHandler.h"
 
-
+ 
 #include <creaImageIOWxGimmickDialog.h>
 
 #include <creaVtkBasicSlicer.h>
diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 589ed81..415c69d 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -583,7 +583,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		int size = _workingGroup->size();
 		for ( int i = 0; i<size; i++ )
 		{
-			manualViewBaseContour * viewer = iter->second->getViewer();
+//EED???			manualViewBaseContour * viewer = iter->second->getViewer();
 			selectedObjects.push_back( iter->first);	
 
 			iter++;
@@ -594,8 +594,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	void wxVtkBaseView_SceneManager :: selectObjects( std::vector< std::string > theExistingObjectsToSelect )
 	{
 		std::map <std::string, ContourWrap_ViewControl *>::iterator iter = _contours_ViewControl->begin(); 
-		int size = _contours_ViewControl->size();	
-		bool selected;
+//EED???		int size = _contours_ViewControl->size();	
+//EED???		bool selected;
 		/*for ( int i = 0; i<size; i++ )
 		{
 			selected = false;
@@ -750,7 +750,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		_wxVTKiren->GetEventPosition( X , Y );
 
 		bool ctrlKey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey() == 1;
-	 	bool shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1;
+//???	 	bool shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1;
 
 		if( _waiting && !ctrlKey )
 		{
@@ -787,7 +787,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 			{
 				//Multiple moving
 				
-				bool ckecking = false;
+//EED???				bool ckecking = false;
 				for( i =0; i<size ; i++ ) 
 				{
 					control = iter->second->getControler();
@@ -873,12 +873,12 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		fclose(ff);*/
 
 
-		char aa = _vtkInteractorStyleBaseView->GetInteractor()->GetKeyCode();
+//EED???		char aa = _vtkInteractorStyleBaseView->GetInteractor()->GetKeyCode();
 		bool condition = false;  
 		//vtkCommand * theComand = _wxVtk_BaseView ->GetInteractorStyleBaseView()->GetCommand(
-		vtkRenderWindowInteractor		* vtkRWInteractor1	= _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); 
-		wxVTKRenderWindowInteractor		* vtkRWInteractor2	= _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor();
-		wxVTKRenderWindowInteractorPlus * vtkRWInteractor3	= (wxVTKRenderWindowInteractorPlus*)_wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor();
+//EED???		vtkRenderWindowInteractor		* vtkRWInteractor1	= _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); 
+//EED???		wxVTKRenderWindowInteractor		* vtkRWInteractor2	= _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor();
+//EED??		wxVTKRenderWindowInteractorPlus * vtkRWInteractor3	= (wxVTKRenderWindowInteractorPlus*)_wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor();
 		vtkRenderWindowInteractor		* vtkRWInteractor	= _vtkInteractorStyleBaseView->GetInteractor();
 		
 		bool ctrlKey = vtkRWInteractor->GetControlKey() == 1;
@@ -965,8 +965,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	bool  wxVtkBaseView_SceneManager :: OnRightButtonDown()
 	{
 		bool condition = false; 
-		vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor();
-		bool ctrlKey = vtkRWInteractor->GetControlKey() == 1;
+//EED???		vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor();
+//EED???		bool ctrlKey = vtkRWInteractor->GetControlKey() == 1;
 		_waiting = true; 
 		
 		condition = true; 		
@@ -1017,9 +1017,9 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 	bool  wxVtkBaseView_SceneManager :: OnRightDClick()
 	{ 
 		bool condition = false;  condition = true; 
-		vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor();
+//EED???		vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor();
 		/*vtkRenderWindowInteractor * vtkRWInteractor1 =*/ _vtkInteractorStyleBaseView->OnChar();
-		wxVTKRenderWindowInteractor * wxVtkRWInterator = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();
+//EED???		wxVTKRenderWindowInteractor * wxVtkRWInterator = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();
 		
 		/*if( _waiting )
 		{
@@ -1125,7 +1125,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		int tmpPx,tmpPy;
 		wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
 		wxVTKiren->GetEventPosition( tmpPx , tmpPy );
-		fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): \n  \n",method.c_str(), tmpPx, tmpPy, sg);
+		fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): %f\n  \n",method.c_str(), tmpPx, tmpPy, sg);
 		fclose(ff);
 	}