X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkMPR3DDataViewer.cxx;h=189bdfaeac5523108b4271a7e1a01a9310ede443;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=5c4e0c7f98622ae20d7411600b68a06ce5e05848;hpb=25e3adf442d6a8d357d52410267445c54426c525;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
index 5c4e0c7..189bdfa 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
@@ -48,27 +48,27 @@ vtkMPR3DDataViewer::vtkMPR3DDataViewer()
 //-------------------------------------------------------------------
 vtkMPR3DDataViewer::~vtkMPR3DDataViewer()
 {
-	if(_outlineData) {_outlineData-> Delete();}
-	if(_mapOutline)  {_mapOutline-> Delete();}
-	if(_outline)	 {_outline-> Delete();}
-
-//	if (_bwLut)				_bwLut->Delete();
-//	if (_hueLut)			_hueLut->Delete();
-//	if (_satLut)			_satLut->Delete();
-	if (_ctfun)				_ctfun->Delete();
-	if (_saggitalColors)	_saggitalColors	->Delete();
-	if (_saggital)			_saggital->Delete();
-	if (_axialColors)		_axialColors->Delete();
-	if (_axial)				_axial->Delete();
-	if (_coronalColors)		_coronalColors->Delete();
-	if (_coronal)			_coronal->Delete();
-
+	if(_outlineData) 		{_outlineData		-> Delete();}
+	if(_mapOutline)  		{_mapOutline		-> Delete();}
+	if(_outline)	 		{_outline			-> Delete();}
+//	if (_bwLut)				{_bwLut				-> Delete();}
+//	if (_hueLut)			{_hueLut			-> Delete();}
+//	if (_satLut)			{_satLut			-> Delete();}
+	if (_ctfun)				{_ctfun				-> Delete();}
+	if (_saggitalColors)	{_saggitalColors	-> Delete();}
+	if (_saggital)			{_saggital			-> Delete();}
+	if (_axialColors)		{_axialColors		-> Delete();}
+	if (_axial)				{_axial				-> Delete();}
+	if (_coronalColors)		{_coronalColors		-> Delete();}
+	if (_coronal)			{_coronal			-> Delete();}
 }
+
 //-------------------------------------------------------------------
 vtkActor* vtkMPR3DDataViewer::GetOutlineActor()
 {
 	return _outline;
 }
+
 //-------------------------------------------------------------------
 vtkImageActor* vtkMPR3DDataViewer::GetImageActor(int id)
 {
@@ -143,17 +143,25 @@ 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() );
+
+//EED 2020-01-27  this is to slow ??? how can we accelerated
+//	_saggitalColors	-> Update();
+//	_axialColors	-> Update();
+//	_coronalColors	-> Update();
+
+	_outlineData	-> SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
 #endif
-	_outlineData	-> SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
 }
 
+
 //-------------------------------------------------------------------
 void vtkMPR3DDataViewer::Configure()
 {