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=eae1cd9361b2439bc1416453f9ee315112d5bcab;hp=de3d2b0241baa4a50463855059f940da6df1a673;hpb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleSphere.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleSphere.cxx
index de3d2b0..177534e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleSphere.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleSphere.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 #include "vtkInteractorStyleSphere.h"
 
@@ -10,14 +35,11 @@ vtkInteractorStyleSphere::vtkInteractorStyleSphere()
 }
 
 //---------------------------------------------------------------------------
-
 vtkInteractorStyleSphere::~vtkInteractorStyleSphere()
 {
 }
 
-
-//---------------------------------------------------------------------------
-
+//--------------------------------------------------------------------------
 bool  vtkInteractorStyleSphere::OnRightButtonDown()
 {
 	if ((_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) && (_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) )
@@ -25,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)
@@ -47,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;
@@ -64,9 +80,7 @@ bool vtkInteractorStyleSphere::OnLeftButtonDown()
 	return true;
 }
 
-
 //---------------------------------------------------------------------------
-
 bool  vtkInteractorStyleSphere::OnLeftButtonUp() 
 {
 	wxSphereView *wxsphereview = (wxSphereView*)(_vtkInteractorStyleBaseView->GetWxVtk2DBaseView());
@@ -79,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;
@@ -116,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;
 }
+
+
+
+
+
+
+
+
+