+/*# ---------------------------------------------------------------------
+#
+# 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 "vtkInteractorStyleBaseView.h"
#include "wxVtk3DBaseView.h"
_refresh_waiting = false;
_parent_refresh_waiting = false;
_blockRefresh = false;
+
+ //EED27Juillet2011
+ SetMouseWheelMotionFactor(0.5);
}
//---------------------------------------------------------------------------
vtkInteractorStyleBaseView::~vtkInteractorStyleBaseView()
{
CallLstInteractorStyleMaracas( 12 );
}
-//---------------------------------------------------------------------------
-void vtkInteractorStyleBaseView::OnMouseWheel() // virtual
+
+
+void vtkInteractorStyleBaseView::OnMouseWheelForward() // virtual
{
- CallLstInteractorStyleMaracas( 14 );
+ CallLstInteractorStyleMaracas( 15 );
+}
+
+void vtkInteractorStyleBaseView::OnMouseWheelBackward() // virtual
+{
+ CallLstInteractorStyleMaracas( 16 );
}
//---------------------------------------------------------------------------
void vtkInteractorStyleBaseView::AddInteractorStyleMaracas(InteractorStyleMaracas* interactorStyleMaracas)
removed = true;
} else {
iter++;
- }
+ }
}
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
{
-
InteractorStyleMaracas *intStyMar;
int i,size=_lstInteractorStyleMaracas.size();
for (i=0;i<size;i++)
{
- if (i < _lstInteractorStyleMaracas.size() )
+ if (i < (int)_lstInteractorStyleMaracas.size() )
{
intStyMar = _lstInteractorStyleMaracas[i];
} else {
i=size;
}
}
- if (type==14)
- { // OnMouseWheel
- if (intStyMar->OnMouseWheel()==false)
+ // 14 ... old OnMouseWheelFordward
+ if (type==15)
+ { // OnMouseWheelForward
+ if (intStyMar->OnMouseWheelForward()==false)
{
i=size;
}
}
+ if (type==16)
+ { // OnMouseWheelBackward
+ if (intStyMar->OnMouseWheelBackward()==false)
+ {
+ i=size;
+ }
+ }
+
+
} // if active
} // for
//---------------------------------------------------------------------------
void vtkInteractorStyleBaseView::EvaluateToRefresh()
{
-
if ( _blockRefresh==false )
{
if ( (_refresh_waiting==true) && (_parent_refresh_waiting==false))
_parent_refresh_waiting = false;
wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
//CPR 13/01/2010
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
this->_wxvtkbaseview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+ this->_wxvtkbaseview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
+
int i;
int size = _lstParentToReport.size();
for(i = 0; i<size; i++)