X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererManagerData.cxx;h=a7680bb84171bd365bb03b189a5a1d18c1c4f411;hb=410e06c32fc330d53bc93f81afeca8b72a6ddb26;hp=89d4dee29bad7d5d9b52c7740a9cb2bb62872372;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.cxx
index 89d4dee..a7680bb 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.cxx
@@ -48,7 +48,7 @@ wxMaracasMultipleVolumeRendererManagerData::wxMaracasMultipleVolumeRendererManag
 	_volumeMapper->AutoAdjustSampleDistancesOn();
 	_volumeProperty = vtkVolumeProperty::New();	
 	_volumeProperty->SetInterpolationTypeToLinear();
-	//_volumeProperty->ShadeOn();
+	_volumeProperty->ShadeOn();
 	_volumeProperty->DisableGradientOpacityOn();	
 	_volumeProperty->SetColor(_ctfun);
 	_volumeProperty->SetScalarOpacity(_tfun );
@@ -56,7 +56,14 @@ wxMaracasMultipleVolumeRendererManagerData::wxMaracasMultipleVolumeRendererManag
 	_newvol = vtkVolume::New();
 	_newvol->SetMapper(_volumeMapper );
 	_newvol->SetProperty(_volumeProperty );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_volumeMapper->SetInput( _vol );
+#else
+	_volumeMapper->SetInputData( _vol );
+#endif
+
 	_volumeMapper->Update();
 	_newvol->Update();
 }