X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualInteractorWindowLevel.cxx;h=8ecfd9e6e32c385c490dec4096200e2682867a84;hb=255f774ce4100c0b84e6b5efa5c64d0db77f8a61;hp=f058df7f60adf1a9693f76a39a496d44c7c3609f;hpb=b80b4dcc301c1c2c63c0f76cd06b0a434350f7a7;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
index f058df7..8ecfd9e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
@@ -52,34 +52,36 @@ bool manualInteractorWindowLevel::OnMouseMove()			// virtual
 	if (_stateWindowLevel==true)
 	{
 		int tmpPx,tmpPy;
-		wxVTKRenderWindowInteractor *wxVTKiren;
+		crea::wxVTKRenderWindowInteractor *wxVTKiren;
 		wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
 		wxVTKiren->GetEventPosition( tmpPx , tmpPy );
-
 		double colorWin;
 		double colorLev;
-		
 		vtkImageData* imgrange = ((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->GetVtkBaseData()->GetImageData();
-
-		if(imgrange != NULL){
+		if(imgrange != NULL)
+		{
 			double* scalarrange = imgrange->GetScalarRange();
-			double scalarr = scalarrange[1] - scalarrange[0];
+			double scalarr;
+			if (scalarrange[1] == scalarrange[0])
+			{
+				scalarr=scalarrange[1];
+				if (scalarrange[1]==0) {scalarr=100;}
+			} else {
+				scalarr = scalarrange[1] - scalarrange[0];
+			}
 			//std::cout<<"scalar r="<<scalarr<<std::endl;
 			int w, h;
 			((wxWindow*)wxVTKiren)->GetSize(&w, &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;
-		}else{
+		} else {
 			colorWin=_backWindow - 2*( _backPx - tmpPx );
 			colorLev=_backLevel  + 2*( _backPy - tmpPy );
 		}
-
 		if (colorWin<0)
 		{ 
 			colorWin=0;
@@ -88,35 +90,26 @@ bool manualInteractorWindowLevel::OnMouseMove()			// virtual
 		{ 
 			colorWin=100000;
 		}	
-		
 //EED 2 Nov 2012  This lets see negative values with the interaction of Window-Level Color
 //		if (colorLev<0)
 //		{ 
 //			colorLev=0;
-//		}
-		
+//		}	
 		if (colorLev>100000)
 		{ 
 			colorLev=100000;
 		}
-		
 		wxVtk2DBaseView *wxvtk2Dbaseview	= (wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
 		vtkBaseData *vtkbasedata			= wxvtk2Dbaseview->GetVtkBaseData();
-		
 //EED Borrame
 //		vtkImageViewer2 *vtkimageviewer2	= wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2();		
 //		vtkimageviewer2->SetColorWindow(colorWin);
 //		vtkimageviewer2->SetColorLevel(colorLev);
-		
 		vtkbasedata->SetColorWindow(colorWin);
-		vtkbasedata->SetColorLevel(colorLev);
-		
+		vtkbasedata->SetColorLevel(colorLev);		
 		this->_vtkInteractorStyleBaseView->SetParent_refresh_waiting();
-		
 //		vtkimageviewer2->Render();
 	}
-
-
 	return true;
 }
 
@@ -127,7 +120,7 @@ bool manualInteractorWindowLevel::OnMiddleButtonDown()	// virtual
 	if ((_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) &&
 	 	(_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) ){
 		_stateWindowLevel	= true;
-		wxVTKRenderWindowInteractor *wxVTKiren;
+		crea::wxVTKRenderWindowInteractor *wxVTKiren;
 		wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
 		wxVTKiren->GetEventPosition( _backPx , _backPy );
 		_backWindow = ((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->_imageViewer2XYZ->GetVtkImageViewer2()->GetColorWindow();