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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
index e43df9a..cb1dc1e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
@@ -34,7 +34,6 @@ vtkMPR3DDataViewer::vtkMPR3DDataViewer()
 	_visiblePosition[2]=false;
 	_ctfun 			= NULL;
 	_vtkmprbasedata	= NULL;
-
 	_ctfun			= NULL;
 	_saggitalColors	= NULL;
 	_saggital		= NULL;
@@ -144,13 +143,15 @@ void vtkMPR3DDataViewer::SetImage()
 {
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
-	_saggitalColors->SetInput( _vtkmprbasedata->GetImageData() );
-	_axialColors->SetInput( _vtkmprbasedata->GetImageData() );
-	_coronalColors->SetInput( _vtkmprbasedata->GetImageData() );
+	_saggitalColors	->SetInput( _vtkmprbasedata->GetImageData() );
+	_axialColors	->SetInput( _vtkmprbasedata->GetImageData() );
+	_coronalColors	->SetInput( _vtkmprbasedata->GetImageData() );
+	_outlineData	->SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
 #else
-	_saggitalColors->SetInputData( _vtkmprbasedata->GetImageData() );
-	_axialColors->SetInputData( _vtkmprbasedata->GetImageData() );
-	_coronalColors->SetInputData( _vtkmprbasedata->GetImageData() );
+	_saggitalColors	->SetInputData( _vtkmprbasedata->GetImageData() );
+	_axialColors	->SetInputData( _vtkmprbasedata->GetImageData() );
+	_coronalColors	->SetInputData( _vtkmprbasedata->GetImageData() );
+	_outlineData	->SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
 #endif
 }
 
@@ -182,10 +183,8 @@ void vtkMPR3DDataViewer::Configure()
     _satLut->SetValueRange (1, 1);
 */
 
-
 	double range[2];
 	double delta;
-	
 	if(_vtkmprbasedata->GetImageData())
 	{
 //EED 2017-01-01 Migration VTK7
@@ -281,18 +280,18 @@ void vtkMPR3DDataViewer::Configure()
 			_saggitalColors = vtkImageMapToColors::New();
 		}
 		_saggitalColors->RemoveAllInputs();
+
+	//    _saggitalColors->SetLookupTable(_bwLut);
+		_saggitalColors->SetLookupTable(_ctfun);
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
 		_saggitalColors->SetInput( _vtkmprbasedata->GetImageData() );
 #else
 		_saggitalColors->SetInputData( _vtkmprbasedata->GetImageData() );
+		_saggitalColors->Update();
 #endif
 		
-	//    _saggitalColors->SetLookupTable(_bwLut);
 		
-		_saggitalColors->SetLookupTable(_ctfun);
-		
-
 		if(_saggital==NULL)
 		{
 			_saggital = vtkImageActor::New();
@@ -305,29 +304,26 @@ void vtkMPR3DDataViewer::Configure()
 		}	
 		//_saggitalColors->Update();
 	
-
-
 	// Create the second (axial) plane of the three planes. We use the
 	// same approach as before except that the extent differs.
 
-		
 		if(_axialColors==NULL)
 		{
 			_axialColors = vtkImageMapToColors::New();
 		}
-
 		_axialColors->RemoveAllInputs();
+	//    _axialColors->SetLookupTable(_hueLut);
+		_axialColors->SetLookupTable(_ctfun);
 
+		
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
 		_axialColors->SetInput( _vtkmprbasedata->GetImageData() );
 #else
 		_axialColors->SetInputData( _vtkmprbasedata->GetImageData() );
+		_axialColors->Update();
 #endif
 
-	//    _axialColors->SetLookupTable(_hueLut);
-		_axialColors->SetLookupTable(_ctfun);
-
 		if(_axial==NULL)
 		{
 			_axial = vtkImageActor::New();
@@ -342,8 +338,6 @@ void vtkMPR3DDataViewer::Configure()
 		}
 		
 		//_axialColors->Update();
-	
-
 		// Create the third (coronal) plane of the three planes. We use 
 	// the same approach as before except that the extent differs.
 		if(_coronalColors==NULL)
@@ -351,16 +345,18 @@ void vtkMPR3DDataViewer::Configure()
 			_coronalColors = vtkImageMapToColors::New();
 		}
 		_coronalColors->RemoveAllInputs();
+	//    _coronalColors->SetLookupTable(_satLut);
+		_coronalColors->SetLookupTable(_ctfun);
 
+		
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
 		_coronalColors->SetInput( _vtkmprbasedata->GetImageData() );
 #else
 		_coronalColors->SetInputData( _vtkmprbasedata->GetImageData() );
+		_coronalColors->Update();
 #endif
 
-	//    _coronalColors->SetLookupTable(_satLut);
-		_coronalColors->SetLookupTable(_ctfun);
 
 		if(_coronal==NULL)
 		{
@@ -375,8 +371,6 @@ void vtkMPR3DDataViewer::Configure()
 
 		} // if _coronal
 		
-	
-
 	// An outline provides context around the data.
 	//
 		if(_outlineData==NULL)
@@ -391,6 +385,7 @@ void vtkMPR3DDataViewer::Configure()
 			_outlineData->SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
 #else
 			_outlineData->SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+			_outlineData->Update();    
 #endif
 		} // if _image
 
@@ -416,7 +411,6 @@ void vtkMPR3DDataViewer::Configure()
 			_outline->GetProperty()->SetColor(0,0,0);
 		}
 	}
-	
 	//int ext[6];
 	//_vtkmprbasedata->GetImageData()->GetExtent(ext);
 }