ENH: Finalization of Add GPU support

Paulo Henrique Junqueira Amorim
1 parent 14de9547
Showing 3 changed files with 47 additions and 9 deletions Show diff stats
invesalius/data/viewer_volume.py
invesalius/data/volume.py
invesalius/gui/frame.py
@@ -178,7 +178,8 @@ class Viewer(wx.Panel):
         ps.Publisher().subscribe(self.SetStereoMode, 'Set stereo mode')
         ps.Publisher().subscribe(self.Reposition3DPlane, 'Reposition 3D Plane')
-
+        
+        ps.Publisher().subscribe(self.RemoveVolume, 'Remove Volume')
     def SetStereoMode(self, pubsub_evt):
         mode = pubsub_evt.data
@@ -318,6 +319,12 @@ class Viewer(wx.Panel):
         for actor in actors:
             self.ren.AddActor(actor)
+    def RemoveVolume(self, pub_evt):
+        volumes = self.ren.GetVolumes()
+        if (volumes.GetNumberOfItems()):
+            self.ren.RemoveVolume(volumes.GetLastProp())
+            self.interactor.Render()
+
     def RemoveActors(self, pubsub_evt):
         "Remove a list of actors"
         actors = pubsub_evt.data[0]
@@ -85,6 +85,7 @@ class Volume():
         self.plane = None
         self.plane_on = False
         self.volume = None
+        self.loaded_image = 0
         self.__bind_events()
     def __bind_events(self):
@@ -106,6 +107,14 @@ class Volume():
         ps.Publisher().subscribe(self.ChangeBackgroundColour,
                         'Change volume viewer background colour')
+        ps.Publisher().subscribe(self.ResetRayCasting, 'Reset Reaycasting')
+
+    def ResetRayCasting(self, pub_evt):
+        if self.exist:
+            self.exist = None
+            self.LoadVolume()
+
+
     def OnCloseProject(self, pubsub_evt):
         self.CloseProject()
@@ -134,7 +143,7 @@ class Volume():
             self.plane.Disable()
         ps.Publisher().sendMessage('Render volume viewer')
-    def OnShowVolume(self, pubsub_evt):
+    def OnShowVolume(self, pubsub_evt = None):
         if self.exist:
             self.volume.SetVisibility(1)
             if (self.plane and self.plane_on):
@@ -451,17 +460,30 @@ class Volume():
                 #convolve.GetOutput().ReleaseDataFlagOn()
         return imagedata
-    def LoadVolume(self):
-        proj = prj.Project()
+    def LoadImage(self):
+        
+
         slice_data = slice_.Slice()
         n_array = slice_data.matrix
         spacing = slice_data.spacing
         slice_number = 0
         orientation = 'AXIAL'
+
         image = imagedata_utils.to_vtk(n_array, spacing, slice_number, orientation) 
         self.image = image
+
+    def LoadVolume(self):
+        proj = prj.Project()
+        #image = imagedata_utils.to_vtk(n_array, spacing, slice_number, orientation) 
+
+        if not self.loaded_image:
+            self.LoadImage()
+            self.loaded_image = 1
+
+        image = self.image
+
         number_filters = len(self.config['convolutionFilters'])
         if (prj.Project().original_orientation == const.AXIAL):
@@ -517,7 +539,8 @@ class Volume():
             volume_mapper.IntermixIntersectingGeometryOn()
             self.volume_mapper = volume_mapper
         else:
-            if ses.Session().rendering == '0':
+
+            if int(ses.Session().rendering) == 0:
                 volume_mapper = vtk.vtkFixedPointVolumeRayCastMapper()
                 #volume_mapper.AutoAdjustSampleDistancesOff()
                 self.volume_mapper = volume_mapper
@@ -568,6 +591,8 @@ class Volume():
         colour = self.GetBackgroundColour()
+        self.exist = 1
+
         ps.Publisher().sendMessage('Load volume into viewer',
                                     (volume, colour, (self.ww, self.wl)))
@@ -325,12 +325,18 @@ class Frame(wx.Frame):
         evt.Skip()
     def ShowPreferences(self):
-        if self.preferences.ShowModal():
+
+        if self.preferences.ShowModal() == wx.ID_OK:
             values = self.preferences.GetPreferences()
             self.preferences.Close()
-        
-        ses.Session().rendering = values[const.RENDERING]
-        ses.Session().surface_interpolation = values[const.SURFACE_INTERPOLATION]
+
+            ses.Session().rendering = values[const.RENDERING]
+            ses.Session().surface_interpolation = values[const.SURFACE_INTERPOLATION]
+
+            ps.Publisher().sendMessage('Remove Volume')
+            ps.Publisher().sendMessage('Reset Reaycasting')
+
+
     def ShowAbout(self):
         """