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=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;hp=5971990bd1adda41d4618b7da269478202d8d5bb;hpb=eb653a89f177ee41fda8720ec32bfbf3aa57255e;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
index 5971990..36b64db 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 
 #include "vtkInteractorStyleBaseView2D.h"
@@ -20,6 +45,11 @@ vtkInteractorStyleBaseView2D::vtkInteractorStyleBaseView2D()
 	//
 	// _vtkInteractorScrollZ = new vtkInteractorScrollZ();
 	// AddInteractorStyleMaracas(_vtkInteractorScrollZ);
+	//
+	//_vtkInteractorZoomCamera = interactorZoomcamera;
+	//AddInteractorStyleMaracas(_vtkInteractorZoomCamera);
+	//
+	//
 	////////////
 }
 //---------------------------------------------------------------------------
@@ -41,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();
 	}
 }
@@ -57,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
 {
@@ -73,6 +115,7 @@ void  vtkInteractorStyleBaseView2D::OnLeftButtonDown() // virtual
 		this->vtkInteractorStyleImage::OnLeftButtonDown();
 	}
 }
+
 //---------------------------------------------------------------------------
 void  vtkInteractorStyleBaseView2D::OnLeftButtonUp () // virtual
 {
@@ -80,6 +123,7 @@ void  vtkInteractorStyleBaseView2D::OnLeftButtonUp () // virtual
 
 	this->vtkInteractorStyleImage::OnLeftButtonUp();
 }
+
 //---------------------------------------------------------------------------
 void  vtkInteractorStyleBaseView2D::OnMiddleButtonDown () // virtual
 {
@@ -90,6 +134,7 @@ void  vtkInteractorStyleBaseView2D::OnMiddleButtonDown () // virtual
 		this->vtkInteractorStyleImage::OnLeftButtonDown();
 	}
 }
+
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView2D::OnMiddleButtonUp () // virtual
 {