X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleBaseView.cxx;h=b40c577960ab68b8c30cf1ab72ac7e50f0ec2ccd;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=3a1918bb45bdce8289ebb1ba84e02d8a3ac6cd73;hpb=e5dd3702826e57ae15d40b8cda521e8ae17d5c57;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
index 3a1918b..b40c577 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.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 "vtkInteractorStyleBaseView.h"
 
 #include "wxVtk3DBaseView.h"
@@ -17,6 +42,9 @@ vtkInteractorStyleBaseView::vtkInteractorStyleBaseView()
 	_refresh_waiting		= false;
 	_parent_refresh_waiting	= false;
 	_blockRefresh			= false;
+	
+	//EED27Juillet2011
+	SetMouseWheelMotionFactor(0.5);
 }
 //---------------------------------------------------------------------------
 vtkInteractorStyleBaseView::~vtkInteractorStyleBaseView()
@@ -75,10 +103,16 @@ void vtkInteractorStyleBaseView::OnRightDClick()  // virtual
 {
 	CallLstInteractorStyleMaracas( 12 );
 }
-//---------------------------------------------------------------------------
-void vtkInteractorStyleBaseView::OnMouseWheel()  // virtual
+
+
+void  vtkInteractorStyleBaseView::OnMouseWheelForward()  // virtual
 {
-	CallLstInteractorStyleMaracas( 14 );
+	CallLstInteractorStyleMaracas( 15 );
+}
+
+void vtkInteractorStyleBaseView::OnMouseWheelBackward() // virtual
+{
+	CallLstInteractorStyleMaracas( 16 );
 }
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::AddInteractorStyleMaracas(InteractorStyleMaracas* interactorStyleMaracas)
@@ -101,7 +135,7 @@ void  vtkInteractorStyleBaseView::RemoveInteractorStyleMaracas(InteractorStyleMa
 			removed = true;
 		} else {
 		  iter++;
-		}
+		}		
 	}		
 }
 //---------------------------------------------------------------------------
@@ -113,21 +147,10 @@ void vtkInteractorStyleBaseView::InsertInteractorStyleMaracas(int pos, Interacto
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 {
-
 	InteractorStyleMaracas *intStyMar;
 
 	int i,size=_lstInteractorStyleMaracas.size();
 
-//EED Borrame
-//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-//fprintf(ff,"EED vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas \n" );
-//for (i=0;i<size;i++)
-//{
-//fprintf(ff,"    %p\n" , _lstInteractorStyleMaracas[i] );
-//}
-//fclose(ff);
-
-
 
 	for (i=0;i<size;i++)
 	{
@@ -215,13 +238,23 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 					i=size;
 				}
 			}
-			if (type==14)
-			{  // OnMouseWheel
-				if (intStyMar->OnMouseWheel()==false)
+			// 14 ... old OnMouseWheelFordward
+			if (type==15)
+			{  // OnMouseWheelForward
+				if (intStyMar->OnMouseWheelForward()==false)
 				{
 					i=size;
 				}
 			}
+			if (type==16)
+			{  // OnMouseWheelBackward
+				if (intStyMar->OnMouseWheelBackward()==false)
+				{
+					i=size;
+				}
+			}
+			
+			
 		} // if active
 	} // for
 
@@ -244,7 +277,8 @@ void vtkInteractorStyleBaseView::TransformCoordinate(double &X, double &Y, doubl
 		double fP[4];
 		imageViewer->GetRenderer()->GetWorldPoint( fP );
 
-		if ( fP[3] ){
+		if ( fP[3] )
+		{
 			fP[0] /= fP[3];
 			fP[1] /= fP[3];
 			fP[2] /= fP[3];
@@ -318,7 +352,6 @@ bool vtkInteractorStyleBaseView::GetParent_refresh_waiting()
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::EvaluateToRefresh()
 {
-
 	if  ( _blockRefresh==false )
 	{
 		if ( (_refresh_waiting==true) && (_parent_refresh_waiting==false))
@@ -331,7 +364,13 @@ void vtkInteractorStyleBaseView::EvaluateToRefresh()
 			_parent_refresh_waiting	= false;
 			wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
 //CPR 13/01/2010
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 			this->_wxvtkbaseview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+			this->_wxvtkbaseview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
+
 			int i;
 			int size = _lstParentToReport.size();
 			for(i = 0; i<size; i++)