More generic code to canvas

Thiago Franco de Moraes
1 parent 011095a8
Showing 2 changed files with 34 additions and 18 deletions Show diff stats
invesalius/data/measures.py
invesalius/data/viewer_slice.py
@@ -575,7 +575,7 @@ class LinearMeasure(object):
         points = []
         for p in self.points:
             coord.SetValue(p)
-            cx, cy = coord.GetComputedDisplayValue(canvas.viewer.slice_data.renderer)
+            cx, cy = coord.GetComputedDisplayValue(canvas.evt_renderer)
             #  canvas.draw_circle((cx, cy), 2.5)
             points.append((cx, cy))
@@ -148,15 +148,25 @@ class ContourMIPConfig(wx.Panel):
 class CanvasRendererCTX:
-    def __init__(self, viewer):
-        self.viewer = viewer
-        self.canvas_renderer = viewer.slice_data.canvas_renderer
+    def __init__(self, evt_renderer, canvas_renderer):
+        """
+        A Canvas to render over a vtktRenderer.
+
+        Params:
+            evt_renderer: a vtkRenderer which this class is going to watch any
+                render event to update the canvas content.
+            canvas_renderer: the vtkRenderer where the canvas is going to be
+                added.
+        """
+        self.canvas_renderer = canvas_renderer
+        self.evt_renderer = evt_renderer
         self._size = self.canvas_renderer.GetSize()
+        self.draw_list = []
         self.gc = None
         self.last_cam_modif_time = -1
         self.modified = True
         self._init_canvas()
-        viewer.slice_data.renderer.AddObserver("StartEvent", self.OnPaint)
+        evt_renderer.AddObserver("StartEvent", self.OnPaint)
     def _init_canvas(self):
         w, h = self._size
@@ -203,7 +213,7 @@ class CanvasRendererCTX:
             self._size = size
             self._resize_canvas(w, h)
-        cam_modif_time = self.viewer.cam.GetMTime()
+        cam_modif_time = self.evt_renderer.GetActiveCamera().GetMTime()
         if (not self.modified) and cam_modif_time == self.last_cam_modif_time:
             return
@@ -233,10 +243,8 @@ class CanvasRendererCTX:
         gc.Scale(1, -1)
         modified = False
-        for (m, mr) in self.viewer.measures.get(self.viewer.orientation, self.viewer.slice_data.number):
-            if not m.visible:
-                continue
-            mr.draw_to_canvas(gc, self)
+        for d in self.draw_list:
+            d.draw_to_canvas(gc, self)
             modified = True
         gc.Destroy()
@@ -1224,7 +1232,7 @@ class Viewer(wx.Panel):
         self.cam = self.slice_data.renderer.GetActiveCamera()
         self.__build_cross_lines()
-        self.canvas = CanvasRendererCTX(self)
+        self.canvas = CanvasRendererCTX(self.slice_data.renderer, self.slice_data.canvas_renderer)
         # Set the slice number to the last slice to ensure the camera if far
         # enough to show all slices.
@@ -1341,6 +1349,16 @@ class Viewer(wx.Panel):
         self.interactor.Render()
     def UpdateCanvas(self, evt=None):
+        for (m, mr) in self.measures.get(self.orientation, self.slice_data.number):
+            try:
+                self.canvas.draw_list.remove(mr)
+            except ValueError:
+                pass
+
+        for (m, mr) in self.measures.get(self.orientation, self.slice_data.number):
+            if m.visible:
+                self.canvas.draw_list.append(mr)
+
         self.canvas.modified = True
         self.interactor.Render()
@@ -1530,14 +1548,12 @@ class Viewer(wx.Panel):
         for actor in self.actors_by_slice_number[index]:
             self.slice_data.renderer.AddActor(actor)
-        #  for (m, mr) in self.measures.get(self.orientation, self.slice_data.number):
-            #  for actor in mr.GetActors():
-                #  self.slice_data.renderer.RemoveActor(actor)
+        for (m, mr) in self.measures.get(self.orientation, self.slice_data.number):
+            self.canvas.draw_list.remove(mr)
-        #  for (m, mr) in self.measures.get(self.orientation, index):
-            #  mr.renderer = self.slice_data.renderer
-            #  for actor in mr.GetActors():
-                #  self.slice_data.renderer.AddActor(actor)
+        for (m, mr) in self.measures.get(self.orientation, index):
+            if m.visible:
+                self.canvas.draw_list.append(mr)
         if self.slice_._type_projection == const.PROJECTION_NORMAL:
             self.slice_data.SetNumber(index)
	@@ -575,7 +575,7 @@ class LinearMeasure(object):		@@ -575,7 +575,7 @@ class LinearMeasure(object):
575	points = []	575	points = []
576	for p in self.points:	576	for p in self.points:
577	coord.SetValue(p)	577	coord.SetValue(p)
578	- cx, cy = coord.GetComputedDisplayValue(canvas.viewer.slice_data.renderer)	578	+ cx, cy = coord.GetComputedDisplayValue(canvas.evt_renderer)
579	# canvas.draw_circle((cx, cy), 2.5)	579	# canvas.draw_circle((cx, cy), 2.5)
580	points.append((cx, cy))	580	points.append((cx, cy))
581		581