FIX: Measurements removal

tatiana
1 parent c281f9ee
Showing 2 changed files with 14 additions and 23 deletions Show diff stats
invesalius/gui/data_notebook.py
invesalius/project.py
@@ -385,16 +385,17 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         # it is necessary to update internal dictionary
         # that maps bitmap given item index
         old_dict = self.mask_list_index
-        new_dict = {}
-        for index in selected_items:
-            self.DeleteItem(index)
-            for i in old_dict:
-                if i < index:
-                    new_dict[i] = old_dict[i]
-                if i > index:
-                    new_dict[i-1] = old_dict[i]
-            old_dict = new_dict
-        self.mask_list_index = new_dict
+        if selected_items:
+            for index in selected_items:
+                new_dict = {}
+                self.DeleteItem(index)
+                for i in old_dict:
+                    if i < index:
+                        new_dict[i] = old_dict[i]
+                    if i > index:
+                        new_dict[i-1] = old_dict[i]
+                old_dict = new_dict
+            self.mask_list_index = new_dict
         if new_dict:
             if index == self.current_index:
@@ -713,9 +714,9 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         # that maps bitmap given item index
         selected_items = self.GetSelected()
         old_dict = self.surface_list_index
-        new_dict = {}
         if selected_items:
             for index in selected_items:
+                new_dict = {}
                 self.DeleteItem(index)
                 for i in old_dict:
                     if i < index:
@@ -959,27 +960,22 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         # that maps bitmap given item index
         selected_items = self.GetSelected()
         selected_items.sort(reverse=True)
-        print "selected_items", selected_items
+
         old_dict = self._list_index
-        new_dict = {}
-        print " self._list_index before",  self._list_index 
         if selected_items:
             for index in selected_items:
-                print "----- index", index
+                new_dict = {}
                 self.DeleteItem(index)
-                print "----- old_dict before", old_dict
                 for i in old_dict:
                     if i < index:
                         new_dict[i] = old_dict[i]
                     if i > index:
                         new_dict[i-1] = old_dict[i]
                 old_dict = new_dict
-                print "----- old_dict after", old_dict
             self._list_index = new_dict
             ps.Publisher().sendMessage('Remove measurements', selected_items)
         else:
            dlg.MeasureSelectionRequiredForRemoval()
-        print "  self._list_index after",  self._list_index 
     def OnCloseProject(self, pubsub_evt):
@@ -149,13 +149,9 @@ 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):
@@ -163,7 +159,6 @@ 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: