X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorScrollZ.cxx;h=29f81ac283a5b71bb06317b4165feb9a1e91d354;hb=3eef3f302abd6996a4eaebb0536770bca9bf428d;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..29f81ac 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.cxx
@@ -9,17 +9,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 +30,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;
 }