X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorScrollZ.cxx;h=49248fb467dfd54362293f59933412d7fbaede94;hb=4ebf92429cae4c60761aa8798a5135c7512d83bc;hp=14a9073c9015bfae3cbabc55533ceb622240adce;hpb=b9d9021717d8036639d4e934f0392d2bc7e3fd3f;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.cxx
index 14a9073..49248fb 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.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 "vtkInteractorScrollZ.h"
 #include "wxVtk2DBaseView.h"
@@ -9,17 +34,17 @@ vtkInteractorScrollZ::vtkInteractorScrollZ()
 {
 	_stateFordware=false;
 }
+
 //---------------------------------------------------------------------------
 vtkInteractorScrollZ::~vtkInteractorScrollZ()
 {
 }
+
 //---------------------------------------------------------------------------
 bool vtkInteractorScrollZ::OnRightButtonDown()
-{    
+{
 	vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor();
-printf("EED %p vtkInteractorScrollZ::OnRightButtonDown A", this );
 	if ((interactor->GetControlKey()==0) && (interactor->GetShiftKey()==0) ){
-printf("EED %p vtkInteractorScrollZ::OnRightButtonDown B", this );
 		_stateFordware	= true;
 		_fordwareX 	= interactor->GetEventPosition()[0];
 		_fordwareY 	= interactor->GetEventPosition()[1];
@@ -30,32 +55,35 @@ printf("EED %p vtkInteractorScrollZ::OnRightButtonDown B", this );
 	}
 	return true;
 }
+
 //---------------------------------------------------------------------------
-bool vtkInteractorScrollZ::OnRightButtonUp() 
+bool vtkInteractorScrollZ::OnRightButtonUp()
 {
 	_stateFordware=false;
 	return true;
 }
+
 //---------------------------------------------------------------------------
-bool vtkInteractorScrollZ::OnMouseMove () 
+bool vtkInteractorScrollZ::OnMouseMove ()
 {
 	if (_stateFordware==true){
-printf("EED %p vtkInteractorScrollZ::OnMouseMove \n", this);
 	    //int fx = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[0];  // JPRx
-        int fy = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[1];
-		int delta = (_fordwareY - fy)/3;
+        int fy      = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[1];
+		double delta   = (_fordwareY - fy)/3.0;
 		/*JCP 14/05/2009
 		_vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->SetActualSlice( _sliceZ + delta);
 		*/
-		((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->SetActualSlice( _sliceZ + delta);
+		((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->SetActualSlice( _sliceZ + (int)delta );
 
 		this->_vtkInteractorStyleBaseView->SetParent_refresh_waiting();
 
 	//	wxCommandEvent newevent(wxEVT_COMMAND_MENU_SELECTED,12121);
 	//	_vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent);
 
-		//_wxvtk2Dbaseview->Refresh();
-	} 
+//EED 21 oct 2010
+//printf("EED vtkInteractorScrollZ::OnMouseMove \n");
+//		((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->Refresh();
+	}
 	return true;
 }