X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleBaseView3D.cxx;h=067ceb91c0bc842400221c19aa2694cb4f2793cd;hb=825f47d7d281a359e9fec03de88e7db58e9e49ff;hp=4b7b592c12c08514b2ddd74316a43759ee6eb1c6;hpb=e5dd3702826e57ae15d40b8cda521e8ae17d5c57;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
index 4b7b592..067ceb9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
@@ -105,7 +105,7 @@ void  vtkInteractorStyleBaseView3D::OnMouseMove ()
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView3D::OnLeftButtonDown()
 {
-	printf("EED creaMaracasVisu::vtkInteractorStyleBaseView3D::OnLeftButtonDown \n");
+//	printf("EED creaMaracasVisu::vtkInteractorStyleBaseView3D::OnLeftButtonDown \n");
 	vtkInteractorStyleBaseView::OnLeftButtonDown();
 /*
 		if (GetInteractor()->GetControlKey()==1 ){
@@ -123,12 +123,22 @@ void vtkInteractorStyleBaseView3D::OnLeftButtonDown()
     return;
     }
 
+	
+	if ((GetInteractor()->GetControlKey()==0) && (GetInteractor()->GetShiftKey()==1) )
+	{
+		this->vtkInteractorStyleImage::OnLeftButtonDown();
+	}
+	
+	
   if (this->Interactor->GetControlKey()) {
       this->StartPan();
   } else {
       this->StartRotate();
   }
 
+	
+	
+
  /* 
   if (this->Interactor->GetShiftKey()) 
     {
@@ -193,3 +203,24 @@ void  vtkInteractorStyleBaseView3D::OnMiddleButtonUp ()
 
 	//		this->vtkInteractorStyleTrackballCamera::OnMiddleButtonUp();
 }
+
+
+//---------------------------------------------------------------------------
+void vtkInteractorStyleBaseView3D::OnMouseWheelForward () // virtual
+{
+	vtkInteractorStyleBaseView::OnMouseWheelForward();	
+	if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) )
+	{
+		this->vtkInteractorStyleImage::OnMouseWheelForward();
+	}
+}
+
+//---------------------------------------------------------------------------
+void vtkInteractorStyleBaseView3D::OnMouseWheelBackward () // virtual
+{
+	vtkInteractorStyleBaseView::OnMouseWheelBackward();	
+	if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) )
+	{
+		this->vtkInteractorStyleImage::OnMouseWheelBackward();
+	}
+}