X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualInteractorWindowLevel.cxx;h=db587e3f890180f89e9967235996e0835487afbf;hb=f7634324fc5790ec510ad4f3db642c705dfb685e;hp=20615fbcaae11f17729da6a3630210c86449a133;hpb=de28ababf60ed57a0f4381c159a2ee8c7515b213;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
index 20615fb..db587e3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
@@ -32,10 +32,8 @@ bool manualInteractorWindowLevel::OnMouseMove()			// virtual
 		wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
 		wxVTKiren->GetEventPosition( tmpPx , tmpPy );
 
-
-		int colorWin;
-		int colorLev;
-
+		double colorWin;
+		double colorLev;
 		
 		vtkImageData* imgrange = ((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->GetVtkBaseData()->GetImageData();
 
@@ -45,8 +43,11 @@ bool manualInteractorWindowLevel::OnMouseMove()			// virtual
 			//std::cout<<"scalar r="<<scalarr<<std::endl;
 			int w, h;
 			((wxWindow*)wxVTKiren)->GetSize(&w, &h);			
-			int dx = (scalarr*( _backPx - tmpPx ))/w;
-			int dy = (scalarr*( _backPy - tmpPy ))/h;
+
+			double dw=w,dh=h;
+			double dx = (scalarr*( _backPx - tmpPx ))/dw;
+			double dy = (scalarr*( _backPy - tmpPy ))/dh;
+
 			//colorWin=_backWindow - (scalarr)*( _backPx - tmpPx );
 			colorWin=_backWindow - dx;
 			colorLev=_backLevel  + dy;
@@ -87,14 +88,12 @@ bool manualInteractorWindowLevel::OnMiddleButtonDown()	// virtual
 {
 	if ((_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) &&
 	 	(_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) ){
-
 		_stateWindowLevel	= true;
 		wxVTKRenderWindowInteractor *wxVTKiren;
 		wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
 		wxVTKiren->GetEventPosition( _backPx , _backPy );
-
-		_backWindow = (int)(((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->_imageViewer2XYZ->GetVtkImageViewer2()->GetColorWindow());
-		_backLevel  = (int)(((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->_imageViewer2XYZ->GetVtkImageViewer2()->GetColorLevel());
+		_backWindow = ((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->_imageViewer2XYZ->GetVtkImageViewer2()->GetColorWindow();
+		_backLevel  = ((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->_imageViewer2XYZ->GetVtkImageViewer2()->GetColorLevel();
 	}
 	return true;
 }