FIX: Show slice planes in the 3D

Paulo Henrique Junqueira Amorim
1 parent 79d131b2
Showing 2 changed files with 17 additions and 6 deletions Show diff stats
invesalius/control.py
invesalius/data/volume.py
@@ -355,7 +355,8 @@ class Controller():
         ps.Publisher().sendMessage('Load slice to viewer',
                         (proj.imagedata,
                         proj.mask_dict))
-
+        
+        ps.Publisher().sendMessage('Load slice plane') 
         ps.Publisher().sendMessage('Bright and contrast adjustment image',\
                                    (proj.window, proj.level))
@@ -30,6 +30,8 @@ import slice_
 import imagedata_utils
 from data import vtk_utils
 from vtk.util import numpy_support
+import session as ses
+
 Kernels = { 
     "Basic Smooth 5x5" : [1.0, 1.0, 1.0, 1.0, 1.0,
@@ -429,7 +431,9 @@ class Volume():
             else:
                 raycasting_function = vtk.vtkVolumeRayCastCompositeFunction()
                 raycasting_function.SetCompositeMethodToInterpolateFirst()
-            self.volume_mapper.SetVolumeRayCastFunction(raycasting_function)
+
+            if ses.Session().rendering == 0:
+                self.volume_mapper.SetVolumeRayCastFunction(raycasting_function)
     def ApplyConvolution(self, imagedata, update_progress = None):
         number_filters = len(self.config['convolutionFilters'])
@@ -512,10 +516,16 @@ class Volume():
             volume_mapper.IntermixIntersectingGeometryOn()
             self.volume_mapper = volume_mapper
         else:
-            volume_mapper = vtk.vtkFixedPointVolumeRayCastMapper()
-            #volume_mapper.AutoAdjustSampleDistancesOff()
-            self.volume_mapper = volume_mapper
-            volume_mapper.IntermixIntersectingGeometryOn()
+
+            if ses.Session().rendering == 0:
+                volume_mapper = vtk.vtkFixedPointVolumeRayCastMapper()
+                #volume_mapper.AutoAdjustSampleDistancesOff()
+                self.volume_mapper = volume_mapper
+                volume_mapper.IntermixIntersectingGeometryOn()
+
+            else:
+                volume_mapper = vtk.vtkGPUVolumeRayCastMapper()
+                self.volume_mapper = volume_mapper
         self.SetTypeRaycasting()
         volume_mapper.SetInput(image2)