X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkMPR3DDataViewer.cxx;h=d15fb27911506ce99d13e386932867ead0ddf1ed;hb=543dfcbe8f5ff78bbed90ef1e20c722bfa0ef248;hp=ef27a33229152953e15a6d5105719190b90a98a8;hpb=2d120b4a381dd83c9bb9e3e05a8da23143f90108;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
index ef27a33..d15fb27 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
@@ -140,19 +140,20 @@ void vtkMPR3DDataViewer::Configure()
 
 
 	double range[2];
-	double max;
+	double delta;
 	
-	if(_vtkmprbasedata->GetImageData()){
+	if(_vtkmprbasedata->GetImageData())
+	{
 		_vtkmprbasedata->GetImageData()->GetScalarRange(range);
-		max = range[1];
+		delta = range[1]-range[0];
 		
 		
 		_ctFunVectorPoint.clear();
-		_ctFunVectorPoint.push_back(max*0/4);
-		_ctFunVectorPoint.push_back(max*1/4);
-		_ctFunVectorPoint.push_back(max*2/4);
-		_ctFunVectorPoint.push_back(max*3/4);
-		_ctFunVectorPoint.push_back(max*4/4);
+		_ctFunVectorPoint.push_back( range[0] + delta*0/4 );
+		_ctFunVectorPoint.push_back( range[0] + delta*1/4 );
+		_ctFunVectorPoint.push_back( range[0] + delta*2/4 );
+		_ctFunVectorPoint.push_back( range[0] + delta*3/4 );
+		_ctFunVectorPoint.push_back( range[0] + delta*4/4 );
 
 		_ctFunVectorRed.clear();
 		_ctFunVectorRed.push_back(0.0);
@@ -176,7 +177,8 @@ void vtkMPR3DDataViewer::Configure()
 		_ctFunVectorBlue.push_back(0.0);
 
 
-		if(_ctfun==NULL){
+		if(_ctfun==NULL)
+		{
 			_ctfun = vtkColorTransferFunction::New();
 		}
 		_ctfun->RemoveAllPoints();
@@ -319,7 +321,8 @@ vtkImageActor * vtkMPR3DDataViewer::GetvtkActor_axial()
 void vtkMPR3DDataViewer::SetPositionX(int pos){
 	int x1,x2,y1,y2,z1,z2;
 	_vtkmprbasedata->GetDimensionExtention(&x1,&x2,&y1,&y2,&z1,&z2);
-	if(_saggital){
+	if(_saggital)
+	{
 		_saggital->SetDisplayExtent( pos , pos , y1 ,y2 , z1 , z2 );
 	}
 }
@@ -327,7 +330,8 @@ void vtkMPR3DDataViewer::SetPositionX(int pos){
 void vtkMPR3DDataViewer::SetPositionY(int pos){
 	int x1,x2,y1,y2,z1,z2;
 	_vtkmprbasedata->GetDimensionExtention(&x1,&x2,&y1,&y2,&z1,&z2);
-	if(_coronal){
+	if(_coronal)
+	{
 		_coronal->SetDisplayExtent(x1,x2, pos,pos, z1,z2);
 	}
 }
@@ -335,7 +339,8 @@ void vtkMPR3DDataViewer::SetPositionY(int pos){
 void vtkMPR3DDataViewer::SetPositionZ(int pos){
 	int x1,x2,y1,y2,z1,z2;
 	_vtkmprbasedata->GetDimensionExtention(&x1,&x2,&y1,&y2,&z1,&z2);
-	if(_axial){
+	if(_axial)
+	{
 		_axial->SetDisplayExtent(x1,x2, y1,y2, pos,pos);
 	}
 }
@@ -351,7 +356,8 @@ bool vtkMPR3DDataViewer::GetVisiblePosition(int idPosition)
 }
 
 void vtkMPR3DDataViewer::setColorTransferFunction(vtkColorTransferFunction* colortable){
-	if(_saggitalColors){
+	if(_saggitalColors)
+	{
 		_saggitalColors->SetLookupTable(colortable);
 		_coronalColors->SetLookupTable(colortable);
 		_axialColors->SetLookupTable(colortable);