X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleBaseView2D.cxx;h=e077370577783109afb801e0aa48251100750dfc;hb=449536b536a44335dc3b5a7604e34484eb046e62;hp=5779b98473621548ae693b421875c15acf2c464d;hpb=0e9c6cea471e235717da5cac8b924254ed3f4f75;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx index 5779b98..e077370 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" @@ -49,7 +74,6 @@ void vtkInteractorStyleBaseView2D::OnRightButtonDown() // virtual if ((GetInteractor()->GetControlKey()==1) && (GetInteractor()->GetShiftKey()==0) ){ this->vtkInteractorStyleImage::OnRightButtonDown(); } - } //--------------------------------------------------------------------------- @@ -102,3 +126,24 @@ void vtkInteractorStyleBaseView2D::OnMiddleButtonUp () // virtual } } +//--------------------------------------------------------------------------- +void vtkInteractorStyleBaseView2D::OnMouseWheelForward () // virtual +{ + vtkInteractorStyleBaseView::OnMouseWheelForward(); + if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) ) + { + this->vtkInteractorStyleImage::OnMouseWheelForward(); + } +} + +//--------------------------------------------------------------------------- +void vtkInteractorStyleBaseView2D::OnMouseWheelBackward () // virtual +{ + vtkInteractorStyleBaseView::OnMouseWheelBackward(); + if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) ) + { + this->vtkInteractorStyleImage::OnMouseWheelBackward(); + } +} + +