FIX: Measure removal / viewer slice render problem

tatiana
1 parent afd317a1
Showing 5 changed files with 34 additions and 20 deletions Show diff stats
invesalius/data/measures.py
invesalius/data/viewer_slice.py
invesalius/gui/data_notebook.py
invesalius/gui/dialogs.py
invesalius/project.py
@@ -104,13 +104,16 @@ class MeasurementManager(object):
             self.current = (m, mr)
+        mr = self.current[1]
+        m = self.current[0]
+
         x, y, z = position
         actors = mr.AddPoint(x, y, z)
         m.points.append(position)
         ps.Publisher().sendMessage(("Add actors", location),
                 (actors, m.slice_number))
-        if self.mr.IsComplete():
+        if mr.IsComplete():
             index = prj.Project().AddMeasurement(m)
             #m.index = index # already done in proj
             self.measures.append(self.current)
@@ -1495,9 +1495,14 @@ class Viewer(wx.Panel):
     def RemoveActors(self, pubsub_evt):
         "Remove a list of actors"
         actors, n = pubsub_evt.data
-        renderer = self.renderers_by_slice_number[n]
-        for actor in actors:
-            # Remove the actor from the renderer
-            renderer.RemoveActor(actor)
-            # and remove the actor from the actor's list
-            self.actors_by_slice_number[n].remove(actor)
+        try:
+            renderer = self.renderers_by_slice_number[n]
+        except KeyError:
+            for actor in actors:
+                self.actors_by_slice_number[n].remove(actor)
+        else:
+            for actor in actors:
+                # Remove the actor from the renderer
+                renderer.RemoveActor(actor)
+                # and remove the actor from the actor's list
+                self.actors_by_slice_number[n].remove(actor)
@@ -501,7 +501,6 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
             if key != index:
                 self.SetItemImage(key, 0)
         self.current_index = index
-
     def AddMask(self, pubsub_evt):
         index, mask_name, threshold_range, colour = pubsub_evt.data
@@ -1088,9 +1087,9 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
             type = TYPE[m.type]
             location = LOCATION[m.location]
             if m.type == const.LINEAR:
-                value = "%.2f mm" % m.value
+                value = (u"%.2f mm") % m.value
             else:
-                value = "%.2f˚" % m.value
+                value = (u"%.2f˚") % m.value
             self.InsertNewItem(m.index, m.name, colour, type, location, value)
@@ -1103,7 +1102,6 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         type_ = pubsub_evt.data[4]
         value = pubsub_evt.data[5]
-
         if index not in self._list_index:
             image = self.CreateColourBitmap(colour)
             image_index = self.imagelist.Add(image)
@@ -613,15 +613,15 @@ def ShowAboutDialog(parent):
                        "Paulo Henrique Junqueira Amorim",
                        "Thiago Franco de Moraes"]
-    info.Translators = ["Alex P. Natsios (EL)",
-                        "Andreas Loupasakis (EL)",
-                        "Cheng-Chia Tseng (ZH)",
-                        "Dimitris Glezos (EL)",
-                        "Eugene Liscio (EN)",
-                        u"Frédéric Lopez (FR)",
-                        "J. Javier de Lima Moreno (ES)"
-                        "Nikos Korkakakis (EL)",
-                        "Sebastian Hilbert (DE)"]
+    info.Translators = ["Alex P. Natsios",
+                        "Andreas Loupasakis",
+                        "Cheng-Chia Tseng",
+                        "Dimitris Glezos",
+                        "Eugene Liscio",
+                        u"Frédéric Lopez",
+                        "Javier de Lima Moreno"
+                        "Nikos Korkakakis",
+                        "Sebastian Hilbert"]
     info.DocWriters = ["Fabio Francisco da Silva (PT)"] 
@@ -149,8 +149,13 @@ class Project(object):
     def AddMeasurement(self, measurement):
+        print "--- proj: AddMeasurement", measurement.index
         index = len(self.measurement_dict)
+        measurement.index = index
+        print "    index:", index
+        print "    dict before:", self.measurement_dict
         self.measurement_dict[index] = measurement
+        print "    dict after:", self.measurement_dict
         return index
     def ChangeMeasurement(self, measurement):
@@ -158,6 +163,7 @@ class Project(object):
         self.measurement_dict[index] = measurement
     def RemoveMeasurement(self, index):
+        print "--- proj: RemoveMeasurement", index
         new_dict = {}
         for i in self.measurement_dict:
             if i < index:
@@ -165,7 +171,9 @@ class Project(object):
             if i > index:
                 new_dict[i-1] = self.measurement_dict[i]
                 new_dict[i-1].index = i-1
+        print "    dict before:", self.measurement_dict
         self.measurement_dict = new_dict
+        print "    dict after:", self.measurement_dict
     def SetAcquisitionModality(self, type_=None):
	@@ -1495,9 +1495,14 @@ class Viewer(wx.Panel):		@@ -1495,9 +1495,14 @@ class Viewer(wx.Panel):
1495	def RemoveActors(self, pubsub_evt):	1495	def RemoveActors(self, pubsub_evt):
1496	"Remove a list of actors"	1496	"Remove a list of actors"
1497	actors, n = pubsub_evt.data	1497	actors, n = pubsub_evt.data
1498	- renderer = self.renderers_by_slice_number[n]
1499	- for actor in actors:
1500	- # Remove the actor from the renderer
1501	- renderer.RemoveActor(actor)
1502	- # and remove the actor from the actor's list
1503	- self.actors_by_slice_number[n].remove(actor)	1498	+ try:
		1499	+ renderer = self.renderers_by_slice_number[n]
		1500	+ except KeyError:
		1501	+ for actor in actors:
		1502	+ self.actors_by_slice_number[n].remove(actor)
		1503	+ else:
		1504	+ for actor in actors:
		1505	+ # Remove the actor from the renderer
		1506	+ renderer.RemoveActor(actor)
		1507	+ # and remove the actor from the actor's list
		1508	+ self.actors_by_slice_number[n].remove(actor)