ENH: Added surface interpolation option

Paulo Henrique Junqueira Amorim
1 parent 51c65c2f
Showing 3 changed files with 24 additions and 8 deletions Show diff stats
invesalius/data/surface.py
invesalius/data/viewer_volume.py
invesalius/gui/frame.py
@@ -128,8 +128,8 @@ class SurfaceManager():
         ps.Publisher().subscribe(self.OnDuplicate, "Duplicate surfaces")
         ps.Publisher().subscribe(self.OnRemove,"Remove surfaces")
-
-
+        ps.Publisher().subscribe(self.UpdateSurfaceInterpolation, 'Update Surface Interpolation')
+    
     def OnDuplicate(self, pubsub_evt):
         selected_items = pubsub_evt.data
         proj = prj.Project()
@@ -508,7 +508,7 @@ class SurfaceManager():
         smoother.Update()
         polydata = smoother.GetOutput()
-        print "Normals"
+        
         normals = vtk.vtkPolyDataNormals()
         normals.SetInput(polydata)
         normals.SetFeatureAngle(80)
@@ -537,7 +537,6 @@ class SurfaceManager():
         # Represent an object (geometry & properties) in the rendered scene
         actor = vtk.vtkActor()
         actor.SetMapper(mapper)
-
         # Create Surface instance
         if overwrite:
             surface = Surface(index = self.last_surface_index)
@@ -550,6 +549,13 @@ class SurfaceManager():
         actor.GetProperty().SetColor(colour)
         actor.GetProperty().SetOpacity(1-surface.transparency)
+        prop = actor.GetProperty()
+
+        interpolation = int(ses.Session().surface_interpolation)
+
+        prop.SetInterpolation(interpolation)
+        #prop.SetInterpolationToPhong()       
+
         # Remove temporary files
         #if sys.platform == "win32":
         #    try:
@@ -606,6 +612,16 @@ class SurfaceManager():
         ps.Publisher().sendMessage('End busy cursor')
+
+    def UpdateSurfaceInterpolation(self, pub_evt):
+        interpolation = int(ses.Session().surface_interpolation)
+        key_actors = self.actors_dict.keys()
+        
+        for key in self.actors_dict:
+            self.actors_dict[key].GetProperty().SetInterpolation(interpolation)
+        ps.Publisher().sendMessage('Render volume viewer')
+
+
     def RemoveActor(self, index):
         """
         Remove actor, according to given actor index.
@@ -626,7 +642,6 @@ class SurfaceManager():
         index, value = pubsub_evt.data
         self.ShowActor(index, value)
-
     def ShowActor(self, index, value):
         """
         Show or hide actor, according to given actor index and value.
@@ -181,6 +181,8 @@ class Viewer(wx.Panel):
         ps.Publisher().subscribe(self.RemoveVolume, 'Remove Volume')
+
+
     def SetStereoMode(self, pubsub_evt):
         mode = pubsub_evt.data
         ren_win = self.interactor.GetRenderWindow()
@@ -332,11 +332,10 @@ class Frame(wx.Frame):
             ses.Session().rendering = values[const.RENDERING]
             ses.Session().surface_interpolation = values[const.SURFACE_INTERPOLATION]
-
+            
             ps.Publisher().sendMessage('Remove Volume')
             ps.Publisher().sendMessage('Reset Reaycasting')
-
-
+            ps.Publisher().sendMessage('Update Surface Interpolation')
     def ShowAbout(self):
         """
	@@ -181,6 +181,8 @@ class Viewer(wx.Panel):		@@ -181,6 +181,8 @@ class Viewer(wx.Panel):
181		181
182	ps.Publisher().subscribe(self.RemoveVolume, 'Remove Volume')	182	ps.Publisher().subscribe(self.RemoveVolume, 'Remove Volume')
183		183
		184	+
		185	+
184	def SetStereoMode(self, pubsub_evt):	186	def SetStereoMode(self, pubsub_evt):
185	mode = pubsub_evt.data	187	mode = pubsub_evt.data
186	ren_win = self.interactor.GetRenderWindow()	188	ren_win = self.interactor.GetRenderWindow()