X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleBaseView.cxx;h=012e2d9a46f4e1b65101660a93a4c3636756b6c2;hb=11899b8f7418abb4b95b70cd574d2de1c7f353ca;hp=2e973842d0bee3858cfe2f2cfd09ba8907de918e;hpb=fc309690300a29fbfbac04f6fdf72783202617ad;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
index 2e97384..012e2d9 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()
@@ -75,11 +78,21 @@ 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)
 {
@@ -131,7 +144,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,13 +228,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
 
@@ -236,25 +259,27 @@ void  vtkInteractorStyleBaseView::OnChar()  // virtual
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::TransformCoordinate(double &X, double &Y, double &Z)
 {
-    vtkImageViewer2 *imageViewer = ((wxVtk2DBaseView*)GetWxVtk2DBaseView())->_imageViewer2XYZ->GetVtkImageViewer2();
+	if(((wxVtk2DBaseView*)GetWxVtk2DBaseView())->_imageViewer2XYZ){
+		vtkImageViewer2 *imageViewer = ((wxVtk2DBaseView*)GetWxVtk2DBaseView())->_imageViewer2XYZ->GetVtkImageViewer2();
 
-	imageViewer->GetRenderer()->SetDisplayPoint((int)X, (int)Y, (int)Z);
-	imageViewer->GetRenderer()->DisplayToWorld();
-	double fP[4];
-	imageViewer->GetRenderer()->GetWorldPoint( fP );
+		imageViewer->GetRenderer()->SetDisplayPoint((int)X, (int)Y, (int)Z);
+		imageViewer->GetRenderer()->DisplayToWorld();
+		double fP[4];
+		imageViewer->GetRenderer()->GetWorldPoint( fP );
 
-	if ( fP[3] ){
-		fP[0] /= fP[3];
-		fP[1] /= fP[3];
-		fP[2] /= fP[3];
-	}
+		if ( fP[3] ){
+			fP[0] /= fP[3];
+			fP[1] /= fP[3];
+			fP[2] /= fP[3];
+		}
 
-// EEDx5
-	((wxVtk2DBaseView*)GetWxVtk2DBaseView())->TransformCoordinate_spacing_ViewToModel(fP[0],fP[1],fP[2]);
+	// EEDx5
+		((wxVtk2DBaseView*)GetWxVtk2DBaseView())->TransformCoordinate_spacing_ViewToModel(fP[0],fP[1],fP[2]);
 
-	X=fP[0];
-	Y=fP[1];
-	Z=fP[2];
+		X=fP[0];
+		Y=fP[1];
+		Z=fP[2];
+	}
 }
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::SetwxVtkBaseView(wxVtkBaseView *wxvtkbaseview)