X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleBaseView.cxx;h=89aee7044a585291e338a9306db000adccbc0f12;hb=eb653a89f177ee41fda8720ec32bfbf3aa57255e;hp=6ed188aeb752215aca6d00cb5569d0548f1b4a87;hpb=199d5048b6c5ac6663b8671f55289e4a0820f9cc;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
index 6ed188a..89aee70 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
@@ -17,6 +17,9 @@ vtkInteractorStyleBaseView::vtkInteractorStyleBaseView()
 	_refresh_waiting		= false;
 	_parent_refresh_waiting	= false;
 	_blockRefresh			= false;
+	
+	//EED27Juillet2011
+	SetMouseWheelMotionFactor(0.5);
 }
 //---------------------------------------------------------------------------
 vtkInteractorStyleBaseView::~vtkInteractorStyleBaseView()
@@ -76,10 +79,28 @@ void vtkInteractorStyleBaseView::OnRightDClick()  // virtual
 	CallLstInteractorStyleMaracas( 12 );
 }
 //---------------------------------------------------------------------------
+//EED27Juillet2011
 void vtkInteractorStyleBaseView::OnMouseWheel()  // virtual
 {
+	printf("EED vtkInteractorStyleBaseView::OnMouseWheel\n");
 	CallLstInteractorStyleMaracas( 14 );
 }
+
+void  vtkInteractorStyleBaseView::OnMouseWheelForward()  // virtual
+{
+	printf("EED.. vtkInteractorStyleBaseView::OnMouseWheelForward\n");
+	CallLstInteractorStyleMaracas( 15 );
+}
+
+void vtkInteractorStyleBaseView::OnMouseWheelBackward() // virtual
+{
+	printf("EED.. vtkInteractorStyleBaseView::OnMouseWheelBackward\n");
+	CallLstInteractorStyleMaracas( 16 );
+}
+
+
+
+
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::AddInteractorStyleMaracas(InteractorStyleMaracas* interactorStyleMaracas)
 {
@@ -131,7 +152,7 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 
 	for (i=0;i<size;i++)
 	{
-		if (i < _lstInteractorStyleMaracas.size() )
+		if (i < (int)_lstInteractorStyleMaracas.size() )
 		{
 			intStyMar = _lstInteractorStyleMaracas[i];
 		} else {
@@ -215,6 +236,8 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 					i=size;
 				}
 			}
+			
+			//EED ?????  27Juillet2011	
 			if (type==14)
 			{  // OnMouseWheel
 				if (intStyMar->OnMouseWheel()==false)
@@ -222,6 +245,22 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 					i=size;
 				}
 			}
+			if (type==15)
+			{  // OnMouseWheelForward
+				if (intStyMar->OnMouseWheelForward()==false)
+				{
+					i=size;
+				}
+			}
+			if (type==16)
+			{  // OnMouseWheelBackward
+				if (intStyMar->OnMouseWheelBackward()==false)
+				{
+					i=size;
+				}
+			}
+			
+			
 		} // if active
 	} // for