X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleSphere.cxx;h=177534ef86ba40be2ff8733c87feee97b1881007;hb=ca35b13e046343c8b50cbd6b833828b06c9d1608;hp=e57cb6537789f955948137da8bb5835e127c04ca;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleSphere.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleSphere.cxx
index e57cb65..177534e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleSphere.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleSphere.cxx
@@ -35,14 +35,11 @@ vtkInteractorStyleSphere::vtkInteractorStyleSphere()
 }
 
 //---------------------------------------------------------------------------
-
 vtkInteractorStyleSphere::~vtkInteractorStyleSphere()
 {
 }
 
-
-//---------------------------------------------------------------------------
-
+//--------------------------------------------------------------------------
 bool  vtkInteractorStyleSphere::OnRightButtonDown()
 {
 	if ((_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) && (_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) )
@@ -50,17 +47,13 @@ bool  vtkInteractorStyleSphere::OnRightButtonDown()
 		_stateRadio	= true;
 		//_fordwareX	= this->Interactor->GetEventPosition()[0];
 		_fordwareY	= _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[1];
-
 		wxSphereView *wxsphereview = (wxSphereView*)(_vtkInteractorStyleBaseView->GetWxVtk2DBaseView());
-
 		_radio = wxsphereview->GetRadio();
 	}
-
 	return true;
 }
 
 //---------------------------------------------------------------------------
-
 bool  vtkInteractorStyleSphere::OnRightButtonUp() 
 {
 	if (_stateRadio==true)
@@ -72,15 +65,13 @@ bool  vtkInteractorStyleSphere::OnRightButtonUp()
 		wxsphereview->GetIdOfImage(radio+0.2);
 		wxsphereview->GetIdOfImage(radio-0.1);
 		wxsphereview->GetIdOfImage(radio-0.2);
-
 		wxsphereview->RefreshView();
 		_stateRadio = false;
 	}
-
 	return true;
 }
-//---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
 bool vtkInteractorStyleSphere::OnLeftButtonDown()
 {
 	_stateRotate	= true;
@@ -89,9 +80,7 @@ bool vtkInteractorStyleSphere::OnLeftButtonDown()
 	return true;
 }
 
-
 //---------------------------------------------------------------------------
-
 bool  vtkInteractorStyleSphere::OnLeftButtonUp() 
 {
 	wxSphereView *wxsphereview = (wxSphereView*)(_vtkInteractorStyleBaseView->GetWxVtk2DBaseView());
@@ -104,23 +93,28 @@ bool  vtkInteractorStyleSphere::OnLeftButtonUp()
 			_vtkInteractorStyleBaseView->TransformCoordinate(x,y,z);	    
 			wxsphereview->SetXYZtoParent(x,y);
 			wxCommandEvent newevent(wxEVT_COMMAND_MENU_SELECTED,12121);
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 			wxsphereview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent);
+#else
+			wxsphereview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent);
+#endif
+
 		} else {
 			wxsphereview->RotationEnd();
 		}
 		wxsphereview->RefreshView();
 		_stateRotate = false;
 	}
-
 	return true;
 }
 
 
 //---------------------------------------------------------------------------
-
 bool  vtkInteractorStyleSphere::OnMouseMove () 
 {
 	wxSphereView *wxsphereview = (wxSphereView*)(_vtkInteractorStyleBaseView->GetWxVtk2DBaseView());
+
 	if (_stateRotate==true)
 	{
 		bool ok_v, ok_ang;
@@ -141,13 +135,23 @@ bool  vtkInteractorStyleSphere::OnMouseMove ()
 	} 
 	if (_stateRadio==true)
 	{	    
+
 		//int fx = this->Interactor->GetEventPosition()[0];
         int fy = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[1];
 		double dif=(fy-_fordwareY) / 10.0;
 		wxsphereview->SetRadio( _radio + dif );
 		wxsphereview->SetDeltaVoxel(3);
+
 		wxsphereview->RefreshView();
 	}
-
 	return true;
 }
+
+
+
+
+
+
+
+
+