X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtk2DBaseView.cxx;h=2942530922006dc77d2baf1782440b45a69887f7;hb=688e59e2d8a0f8db3d28dfd5b2f8a256903b2714;hp=4ade1682394fa7df720fd625f3bcad94066d87e0;hpb=e263b7ace0f53d647a731553a3f67700838ad146;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
index 4ade168..2942530 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
@@ -124,7 +124,7 @@ printf("//EED wxVtk2DBaseView::ResetView %d %d    %d %d     %d %d \n",x1,x2,y1,y
 //EED 24oct2010
     _imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel()->Modified();
 
-	_imageViewer2XYZ->GetVtkImageViewer2()->Render();
+//EED2120-06-23	_imageViewer2XYZ->GetVtkImageViewer2()->Render();
 
 	//////////////
 	//RaC 04-2010 Look for the description of new changes in vtkInteractorStyleBaseView2D constructor.
@@ -141,6 +141,11 @@ printf("//EED wxVtk2DBaseView::ResetView %d %d    %d %d     %d %d \n",x1,x2,y1,y
 	vtkInteractorScrollZ *_vtkInteractorScrollZ = new vtkInteractorScrollZ();
 	style2D->SetInteractorScrollZ(_vtkInteractorScrollZ);
 
+	vtkInteractorZoomCamera *_vtkInteractorZoomCamera = new vtkInteractorZoomCamera();
+	style2D->SetInteractorZoomCamera(_vtkInteractorZoomCamera);
+
+
+
 	SetInteractorStyleImage( style2D );
 
 	// RaC
@@ -200,6 +205,9 @@ void wxVtk2DBaseView::Configure(bool okimage)
 		vtkInteractorScrollZ *_vtkInteractorScrollZ = new vtkInteractorScrollZ();
 		style2D->SetInteractorScrollZ(_vtkInteractorScrollZ);
 
+		vtkInteractorZoomCamera *_vtkInteractorZoomCamera = new vtkInteractorZoomCamera();
+		style2D->SetInteractorZoomCamera(_vtkInteractorZoomCamera);
+
 		SetInteractorStyleImage( style2D );
 
 		// RaC
@@ -418,3 +426,13 @@ int wxVtk2DBaseView::GetDirection() // virtual
     return 2;
 }
 
+//-------------------------------------------------------------------
+void wxVtk2DBaseView::SetOpacityText(double opacity)
+{
+	if (_vtkIinfoTextImage!=NULL)
+	{
+		_vtkIinfoTextImage->SetOpacity( opacity );
+	}
+}
+
+