X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleBaseView3D.cxx;h=cc0f1a3d39d6abc095661234c459370f67445847;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=0b2e7c2265d638a366d3eda0e831bd10b812452c;hpb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
index 0b2e7c2..cc0f1a3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.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 "vtkInteractorStyleBaseView3D.h"
 
@@ -103,8 +128,9 @@ void  vtkInteractorStyleBaseView3D::OnMouseMove ()
 
 }
 //---------------------------------------------------------------------------
-void  vtkInteractorStyleBaseView3D::OnLeftButtonDown ()
+void vtkInteractorStyleBaseView3D::OnLeftButtonDown()
 {
+//	printf("EED creaMaracasVisu::vtkInteractorStyleBaseView3D::OnLeftButtonDown \n");
 	vtkInteractorStyleBaseView::OnLeftButtonDown();
 /*
 		if (GetInteractor()->GetControlKey()==1 ){
@@ -122,12 +148,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()) 
     {
@@ -192,3 +228,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();
+	}
+}