No-gui doing less work when creating surface

Thiago Franco de Moraes
1 parent e7bc240b
Showing 3 changed files with 117 additions and 101 deletions Show diff stats
app.py
invesalius/data/slice_.py
invesalius/data/surface.py
@@ -361,7 +361,6 @@ def export(path_, threshold_range):
     }
     Publisher.sendMessage('Create surface from index', surface_options)
     Publisher.sendMessage('Export surface to file', (path_, const.FILETYPE_STL))
-    Publisher.sendMessage('Remove surfaces', [0])
 def print_events(data):
@@ -353,19 +353,19 @@ class Slice(object):
         # TODO: merge this code with apply_slice_buffer_to_mask
         b_mask = self.buffer_slices["AXIAL"].mask
-        if b_mask:
+        if b_mask is not None:
             n = self.buffer_slices["AXIAL"].index + 1
             self.current_mask.matrix[n, 1:, 1:] = b_mask
             self.current_mask.matrix[n, 0, 0] = 1
         b_mask = self.buffer_slices["CORONAL"].mask
-        if b_mask:
+        if b_mask is not None:
             n = self.buffer_slices["CORONAL"].index + 1
             self.current_mask.matrix[1:, n, 1:] = b_mask
             self.current_mask.matrix[0, n, 0] = 1
         b_mask = self.buffer_slices["SAGITAL"].mask
-        if b_mask:
+        if b_mask is not None:
             n = self.buffer_slices["SAGITAL"].index + 1
             self.current_mask.matrix[1:, 1:, n] = b_mask
             self.current_mask.matrix[0, 0, n] = 1
@@ -885,7 +885,7 @@ class Slice(object):
                     self.current_mask.matrix[n+1, 1:, 1:] = m
             else:
                 slice_ = self.buffer_slices[orientation].image
-                if slice_:
+                if slice_ is not None:
                     self.buffer_slices[orientation].mask = (255 * ((slice_ >= thresh_min) & (slice_ <= thresh_max))).astype('uint8')
             # Update viewer
@@ -661,7 +661,6 @@ class SurfaceManager():
             #  polydata.SetSource(None)
             del decimation
-        to_measure = polydata
         #to_measure.Register(None)
         #  to_measure.SetSource(None)
@@ -700,115 +699,133 @@ class SurfaceManager():
             #  polydata.DebugOn()
             del filled_polydata
-        normals = vtk.vtkPolyDataNormals()
-        #  normals.ReleaseDataFlagOn()
-        normals_ref = weakref.ref(normals)
-        normals_ref().AddObserver("ProgressEvent", lambda obj,evt:
-                        UpdateProgress(normals_ref(), _("Creating 3D surface...")))
-        normals.SetInputData(polydata)
-        normals.SetFeatureAngle(80)
-        normals.AutoOrientNormalsOn()
-        #  normals.GetOutput().ReleaseDataFlagOn()
-        normals.Update()
-        del polydata
-        polydata = normals.GetOutput()
-        #polydata.Register(None)
-        #  polydata.SetSource(None)
-        del normals
-
-        # Improve performance
-        stripper = vtk.vtkStripper()
-        #  stripper.ReleaseDataFlagOn()
-        stripper_ref = weakref.ref(stripper)
-        stripper_ref().AddObserver("ProgressEvent", lambda obj,evt:
-                        UpdateProgress(stripper_ref(), _("Creating 3D surface...")))
-        stripper.SetInputData(polydata)
-        stripper.PassThroughCellIdsOn()
-        stripper.PassThroughPointIdsOn()
-        #  stripper.GetOutput().ReleaseDataFlagOn()
-        stripper.Update()
-        del polydata
-        polydata = stripper.GetOutput()
-        #polydata.Register(None)
-        #  polydata.SetSource(None)
-        del stripper
+        to_measure = polydata
-        # Map polygonal data (vtkPolyData) to graphics primitives.
-        mapper = vtk.vtkPolyDataMapper()
-        mapper.SetInputData(polydata)
-        mapper.ScalarVisibilityOff()
-        #  mapper.ReleaseDataFlagOn()
-        mapper.ImmediateModeRenderingOn() # improve performance
+        # If InVesalius is running without GUI
+        if wx.GetApp() is None:
+            proj = prj.Project()
+            #Create Surface instance
+            if overwrite:
+                surface = Surface(index = self.last_surface_index)
+                proj.ChangeSurface(surface)
+            else:
+                surface = Surface(name=surface_name)
+                index = proj.AddSurface(surface)
+                surface.index = index
+                self.last_surface_index = index
+            surface.colour = colour
+            surface.polydata = polydata
-        # Represent an object (geometry & properties) in the rendered scene
-        actor = vtk.vtkActor()
-        actor.SetMapper(mapper)
-        del mapper
-        #Create Surface instance
-        if overwrite:
-            surface = Surface(index = self.last_surface_index)
+        # With GUI
         else:
-            surface = Surface(name=surface_name)
-        surface.colour = colour
-        surface.polydata = polydata
-        del polydata
+            normals = vtk.vtkPolyDataNormals()
+            #  normals.ReleaseDataFlagOn()
+            normals_ref = weakref.ref(normals)
+            normals_ref().AddObserver("ProgressEvent", lambda obj,evt:
+                            UpdateProgress(normals_ref(), _("Creating 3D surface...")))
+            normals.SetInputData(polydata)
+            normals.SetFeatureAngle(80)
+            normals.AutoOrientNormalsOn()
+            #  normals.GetOutput().ReleaseDataFlagOn()
+            normals.Update()
+            del polydata
+            polydata = normals.GetOutput()
+            #polydata.Register(None)
+            #  polydata.SetSource(None)
+            del normals
-        # Set actor colour and transparency
-        actor.GetProperty().SetColor(colour)
-        actor.GetProperty().SetOpacity(1-surface.transparency)
+            # Improve performance
+            stripper = vtk.vtkStripper()
+            #  stripper.ReleaseDataFlagOn()
+            stripper_ref = weakref.ref(stripper)
+            stripper_ref().AddObserver("ProgressEvent", lambda obj,evt:
+                            UpdateProgress(stripper_ref(), _("Creating 3D surface...")))
+            stripper.SetInputData(polydata)
+            stripper.PassThroughCellIdsOn()
+            stripper.PassThroughPointIdsOn()
+            #  stripper.GetOutput().ReleaseDataFlagOn()
+            stripper.Update()
+            del polydata
+            polydata = stripper.GetOutput()
+            #polydata.Register(None)
+            #  polydata.SetSource(None)
+            del stripper
-        prop = actor.GetProperty()
+            # Map polygonal data (vtkPolyData) to graphics primitives.
+            mapper = vtk.vtkPolyDataMapper()
+            mapper.SetInputData(polydata)
+            mapper.ScalarVisibilityOff()
+            #  mapper.ReleaseDataFlagOn()
+            mapper.ImmediateModeRenderingOn() # improve performance
-        interpolation = int(ses.Session().surface_interpolation)
+            # Represent an object (geometry & properties) in the rendered scene
+            actor = vtk.vtkActor()
+            actor.SetMapper(mapper)
+            del mapper
+            #Create Surface instance
+            if overwrite:
+                surface = Surface(index = self.last_surface_index)
+            else:
+                surface = Surface(name=surface_name)
+            surface.colour = colour
+            surface.polydata = polydata
+            del polydata
-        prop.SetInterpolation(interpolation)
+            # Set actor colour and transparency
+            actor.GetProperty().SetColor(colour)
+            actor.GetProperty().SetOpacity(1-surface.transparency)
-        proj = prj.Project()
-        if overwrite:
-            proj.ChangeSurface(surface)
-        else:
-            index = proj.AddSurface(surface)
-            surface.index = index
-            self.last_surface_index = index
+            prop = actor.GetProperty()
-        session = ses.Session()
-        session.ChangeProject()
+            interpolation = int(ses.Session().surface_interpolation)
-        # The following lines have to be here, otherwise all volumes disappear
-        measured_polydata = vtk.vtkMassProperties()
-        #  measured_polydata.ReleaseDataFlagOn()
-        measured_polydata.SetInputData(to_measure)
-        volume =  float(measured_polydata.GetVolume())
-        area =  float(measured_polydata.GetSurfaceArea())
-        surface.volume = volume
-        surface.area = area
-        self.last_surface_index = surface.index
-        del measured_polydata
-        del to_measure
+            prop.SetInterpolation(interpolation)
-        Publisher.sendMessage('Load surface actor into viewer', actor)
+            proj = prj.Project()
+            if overwrite:
+                proj.ChangeSurface(surface)
+            else:
+                index = proj.AddSurface(surface)
+                surface.index = index
+                self.last_surface_index = index
-        # Send actor by pubsub to viewer's render
-        if overwrite and self.actors_dict.keys():
-            old_actor = self.actors_dict[self.last_surface_index]
-            Publisher.sendMessage('Remove surface actor from viewer', old_actor)
+            session = ses.Session()
+            session.ChangeProject()
-        # Save actor for future management tasks
-        self.actors_dict[surface.index] = actor
+            measured_polydata = vtk.vtkMassProperties()
+            #  measured_polydata.ReleaseDataFlagOn()
+            measured_polydata.SetInputData(to_measure)
+            volume =  float(measured_polydata.GetVolume())
+            area =  float(measured_polydata.GetSurfaceArea())
+            surface.volume = volume
+            surface.area = area
+            self.last_surface_index = surface.index
+            del measured_polydata
+            del to_measure
-        Publisher.sendMessage('Update surface info in GUI',
-                                    (surface.index, surface.name,
-                                    surface.colour, surface.volume,
-                                    surface.area,
-                                    surface.transparency))
-
-        #When you finalize the progress. The bar is cleaned.
-        UpdateProgress = vu.ShowProgress(1)
-        UpdateProgress(0, _("Ready"))
-        Publisher.sendMessage('Update status text in GUI', _("Ready"))
-
-        Publisher.sendMessage('End busy cursor')
-        del actor
+            Publisher.sendMessage('Load surface actor into viewer', actor)
+
+            # Send actor by pubsub to viewer's render
+            if overwrite and self.actors_dict.keys():
+                old_actor = self.actors_dict[self.last_surface_index]
+                Publisher.sendMessage('Remove surface actor from viewer', old_actor)
+
+            # Save actor for future management tasks
+            self.actors_dict[surface.index] = actor
+
+            Publisher.sendMessage('Update surface info in GUI',
+                                        (surface.index, surface.name,
+                                        surface.colour, surface.volume,
+                                        surface.area,
+                                        surface.transparency))
+
+            #When you finalize the progress. The bar is cleaned.
+            UpdateProgress = vu.ShowProgress(1)
+            UpdateProgress(0, _("Ready"))
+            Publisher.sendMessage('Update status text in GUI', _("Ready"))
+
+            Publisher.sendMessage('End busy cursor')
+            del actor
     def UpdateSurfaceInterpolation(self, pub_evt):
         interpolation = int(ses.Session().surface_interpolation)
	@@ -361,7 +361,6 @@ def export(path_, threshold_range):		@@ -361,7 +361,6 @@ def export(path_, threshold_range):
361	}	361	}
362	Publisher.sendMessage('Create surface from index', surface_options)	362	Publisher.sendMessage('Create surface from index', surface_options)
363	Publisher.sendMessage('Export surface to file', (path_, const.FILETYPE_STL))	363	Publisher.sendMessage('Export surface to file', (path_, const.FILETYPE_STL))
364	- Publisher.sendMessage('Remove surfaces', [0])
365		364
366		365
367	def print_events(data):	366	def print_events(data):
	@@ -353,19 +353,19 @@ class Slice(object):		@@ -353,19 +353,19 @@ class Slice(object):
353		353
354	# TODO: merge this code with apply_slice_buffer_to_mask	354	# TODO: merge this code with apply_slice_buffer_to_mask
355	b_mask = self.buffer_slices["AXIAL"].mask	355	b_mask = self.buffer_slices["AXIAL"].mask
356	- if b_mask:	356	+ if b_mask is not None:
357	n = self.buffer_slices["AXIAL"].index + 1	357	n = self.buffer_slices["AXIAL"].index + 1
358	self.current_mask.matrix[n, 1:, 1:] = b_mask	358	self.current_mask.matrix[n, 1:, 1:] = b_mask
359	self.current_mask.matrix[n, 0, 0] = 1	359	self.current_mask.matrix[n, 0, 0] = 1
360		360
361	b_mask = self.buffer_slices["CORONAL"].mask	361	b_mask = self.buffer_slices["CORONAL"].mask
362	- if b_mask:	362	+ if b_mask is not None:
363	n = self.buffer_slices["CORONAL"].index + 1	363	n = self.buffer_slices["CORONAL"].index + 1
364	self.current_mask.matrix[1:, n, 1:] = b_mask	364	self.current_mask.matrix[1:, n, 1:] = b_mask
365	self.current_mask.matrix[0, n, 0] = 1	365	self.current_mask.matrix[0, n, 0] = 1
366		366
367	b_mask = self.buffer_slices["SAGITAL"].mask	367	b_mask = self.buffer_slices["SAGITAL"].mask
368	- if b_mask:	368	+ if b_mask is not None:
369	n = self.buffer_slices["SAGITAL"].index + 1	369	n = self.buffer_slices["SAGITAL"].index + 1
370	self.current_mask.matrix[1:, 1:, n] = b_mask	370	self.current_mask.matrix[1:, 1:, n] = b_mask
371	self.current_mask.matrix[0, 0, n] = 1	371	self.current_mask.matrix[0, 0, n] = 1
	@@ -885,7 +885,7 @@ class Slice(object):		@@ -885,7 +885,7 @@ class Slice(object):
885	self.current_mask.matrix[n+1, 1:, 1:] = m	885	self.current_mask.matrix[n+1, 1:, 1:] = m
886	else:	886	else:
887	slice_ = self.buffer_slices[orientation].image	887	slice_ = self.buffer_slices[orientation].image
888	- if slice_:	888	+ if slice_ is not None:
889	self.buffer_slices[orientation].mask = (255 * ((slice_ >= thresh_min) & (slice_ <= thresh_max))).astype('uint8')	889	self.buffer_slices[orientation].mask = (255 * ((slice_ >= thresh_min) & (slice_ <= thresh_max))).astype('uint8')
890		890
891	# Update viewer	891	# Update viewer