Merge branch 'vtk7itk4' of ssh://git.creatis.insa-lyon.fr/creaMaracasVisu into vtk7itk4

[creaMaracasVisu.git] / lib / Kernel / VTKObjects / VolumeRenderer / volumerenderermanagerdata.cxx

diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
index fcfd3c3b9763ce94658e96783e7b25d9a1bc01ae..ac531f2bf5326e8b3b6a4427153e0a0b2e9d5854 100644 (file)
--- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
+++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
@@ -76,13 +76,13 @@ VolumeRendererManagerData::VolumeRendererManagerData(vtkImageData* vol, vtkRende
 
 }
 
-void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string dataname, bool usegpu){
-    _id = 0;
-    _vol = vol;
-    _dataname = dataname;
-
+void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string dataname, bool usegpu)
+{
+    _id                        = 0;
+    _vol                       = vol;
+    _dataname          = dataname;
 
-    _volumePlanes  = vtkPlanes::New();
+    _volumePlanes      = vtkPlanes::New();
 
     _volumeProperty = vtkVolumeProperty::New();
     _volumeProperty->SetInterpolationTypeToLinear();
@@ -159,14 +159,14 @@ void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string datana
 
 #if VTK_MAJOR_VERSION >= 6
        cout<<"using SmartVolumeRenderingMapper render GPU"<<endl;
-       vtkSmartVolumeMapper * smartvolumemapper                        = vtkSmartVolumeMapper::New();
+       vtkSmartVolumeMapper * smartvolumemapper = vtkSmartVolumeMapper::New();
        VolumeMapper                                                    = smartvolumemapper;
-       smartvolumemapper->AutoAdjustSampleDistancesOn();
+//       smartvolumemapper->AutoAdjustSampleDistancesOn();
 #else
        _compositeFunction                                              = vtkVolumeRayCastCompositeFunction::New();
-       _MIPFunction                                                    = vtkVolumeRayCastMIPFunction::New();
-       vtkVolumeRayCastMapper* volumeMapper                            = vtkVolumeRayCastMapper::New();
-       VolumeMapper                                                    = volumeMapper;
+       _MIPFunction                                                            = vtkVolumeRayCastMIPFunction::New();
+       vtkVolumeRayCastMapper* volumeMapper            = vtkVolumeRayCastMapper::New();
+       VolumeMapper                                                            = volumeMapper;
        volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
        volumeMapper->AutoAdjustSampleDistancesOn();
 #endif