More generic code to canvas

Thiago Franco de Moraes
1 parent b9f1086f
Showing 2 changed files with 5 additions and 2 deletions Show diff stats
invesalius/data/measures.py
invesalius/data/viewer_slice.py
@@ -835,7 +835,7 @@ class AngularMeasure(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))
  
@@ -1549,7 +1549,10 @@ class Viewer(wx.Panel):
             self.slice_data.renderer.AddActor(actor)
  
         for (m, mr) in self.measures.get(self.orientation, self.slice_data.number):
-            self.canvas.draw_list.remove(mr)
+            try:
+                self.canvas.draw_list.remove(mr)
+            except ValueError:
+                pass
  
         for (m, mr) in self.measures.get(self.orientation, index):
             if m.visible:
...	...	@@ -835,7 +835,7 @@ class AngularMeasure(object):
835	835	points = []
836	836	for p in self.points:
837	837	coord.SetValue(p)
838		- cx, cy = coord.GetComputedDisplayValue(canvas.viewer.slice_data.renderer)
	838	+ cx, cy = coord.GetComputedDisplayValue(canvas.evt_renderer)
839	839	# canvas.draw_circle((cx, cy), 2.5)
840	840	points.append((cx, cy))
841	841
...	...
...	...	@@ -1549,7 +1549,10 @@ class Viewer(wx.Panel):
1549	1549	self.slice_data.renderer.AddActor(actor)
1550	1550
1551	1551	for (m, mr) in self.measures.get(self.orientation, self.slice_data.number):
1552		- self.canvas.draw_list.remove(mr)
	1552	+ try:
	1553	+ self.canvas.draw_list.remove(mr)
	1554	+ except ValueError:
	1555	+ pass
1553	1556
1554	1557	for (m, mr) in self.measures.get(self.orientation, index):
1555	1558	if m.visible:
...	...