X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleBaseView2D.cxx;h=36b64db0ea7aa49b276ad238c1ca77a11802236a;hb=ca35b13e046343c8b50cbd6b833828b06c9d1608;hp=e077370577783109afb801e0aa48251100750dfc;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
index e077370..36b64db 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
@@ -45,6 +45,11 @@ vtkInteractorStyleBaseView2D::vtkInteractorStyleBaseView2D()
 	//
 	// _vtkInteractorScrollZ = new vtkInteractorScrollZ();
 	// AddInteractorStyleMaracas(_vtkInteractorScrollZ);
+	//
+	//_vtkInteractorZoomCamera = interactorZoomcamera;
+	//AddInteractorStyleMaracas(_vtkInteractorZoomCamera);
+	//
+	//
 	////////////
 }
 //---------------------------------------------------------------------------
@@ -66,12 +71,22 @@ void  vtkInteractorStyleBaseView2D::SetInteractorWindowLevel(manualInteractorWin
 	AddInteractorStyleMaracas(_manualinteractorwindowlevel);
 }
 
+
+//---------------------------------------------------------------------------
+void  vtkInteractorStyleBaseView2D::SetInteractorZoomCamera(vtkInteractorZoomCamera* interactorZoomcamera)
+{    
+	_vtkInteractorZoomCamera = interactorZoomcamera;
+	AddInteractorStyleMaracas(_vtkInteractorZoomCamera);
+}
+
+
 //---------------------------------------------------------------------------
 void  vtkInteractorStyleBaseView2D::OnRightButtonDown()  // virtual
 {    
 	vtkInteractorStyleBaseView::OnRightButtonDown();
 
-	if ((GetInteractor()->GetControlKey()==1) && (GetInteractor()->GetShiftKey()==0) ){
+	if ((GetInteractor()->GetControlKey()==1) && (GetInteractor()->GetShiftKey()==0) )
+	{
 		this->vtkInteractorStyleImage::OnRightButtonDown();
 	}
 }
@@ -82,12 +97,14 @@ void  vtkInteractorStyleBaseView2D::OnRightButtonUp()  // virtual
 	vtkInteractorStyleBaseView::OnRightButtonUp();
 	this->vtkInteractorStyleImage::OnRightButtonUp();
 }
+
 //---------------------------------------------------------------------------
 void  vtkInteractorStyleBaseView2D::OnMouseMove () // virtual
 {
 	vtkInteractorStyleBaseView::OnMouseMove();
 	this->vtkInteractorStyleImage::OnMouseMove();
 }
+
 //---------------------------------------------------------------------------
 void  vtkInteractorStyleBaseView2D::OnLeftButtonDown() // virtual
 {
@@ -98,6 +115,7 @@ void  vtkInteractorStyleBaseView2D::OnLeftButtonDown() // virtual
 		this->vtkInteractorStyleImage::OnLeftButtonDown();
 	}
 }
+
 //---------------------------------------------------------------------------
 void  vtkInteractorStyleBaseView2D::OnLeftButtonUp () // virtual
 {
@@ -105,6 +123,7 @@ void  vtkInteractorStyleBaseView2D::OnLeftButtonUp () // virtual
 
 	this->vtkInteractorStyleImage::OnLeftButtonUp();
 }
+
 //---------------------------------------------------------------------------
 void  vtkInteractorStyleBaseView2D::OnMiddleButtonDown () // virtual
 {
@@ -115,6 +134,7 @@ void  vtkInteractorStyleBaseView2D::OnMiddleButtonDown () // virtual
 		this->vtkInteractorStyleImage::OnLeftButtonDown();
 	}
 }
+
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView2D::OnMiddleButtonUp () // virtual
 {