Download as
Browse Code »

Commit e7d7870d8eac0e739eed2c2044a9acd7b3d37394

Authored by tfmoraes
1 parent cc2c99a6
Exists in master and in 68 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, invesalius-libift, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

FIX: A keyerror on add a measure

Showing 1 changed file with 19 additions and 3 deletions   Show diff stats
invesalius/data/measures.py
  Diff comments   View file @e7d7870
@@ -65,15 +65,20 @@ class MeasurementManager(object): @@ -65,15 +65,20 @@ class MeasurementManager(object):
65 except IndexError: 65 except IndexError:
66 slice_number = 0 66 slice_number = 0
67 67
  68 + to_remove = False
68 if self.current is None: 69 if self.current is None:
69 print "To Create" 70 print "To Create"
70 to_create = True 71 to_create = True
71 - elif self.current[0].slice_number != slice_number: 72 + elif self.current[0].location != location:
72 print "To Create" 73 print "To Create"
  74 + print "To Remove"
73 to_create = True 75 to_create = True
74 - elif self.current[0].location != location: 76 + to_remove = True
  77 + elif self.current[0].slice_number != slice_number:
75 print "To Create" 78 print "To Create"
  79 + print "To Remove"
76 to_create = True 80 to_create = True
  81 + to_remove = True
77 else: 82 else:
78 print "To not Create" 83 print "To not Create"
79 to_create = False 84 to_create = False
@@ -83,11 +88,22 @@ class MeasurementManager(object): @@ -83,11 +88,22 @@ class MeasurementManager(object):
83 m.index = len(self.measures) 88 m.index = len(self.measures)
84 m.location = location 89 m.location = location
85 m.slice_number = slice_number 90 m.slice_number = slice_number
  91 + m.type = type
86 if type == const.LINEAR: 92 if type == const.LINEAR:
87 mr = LinearMeasure(m.colour) 93 mr = LinearMeasure(m.colour)
88 else: 94 else:
89 mr = AngularMeasure(m.colour) 95 mr = AngularMeasure(m.colour)
90 - m.type = type 96 + if to_remove:
  97 + print "---To REMOVE"
  98 + actors = self.current[1].GetActors()
  99 + slice_number = self.current[0].slice_number
  100 + ps.Publisher().sendMessage(('Remove actors',
  101 + self.current[0].location), (actors, slice_number))
  102 + if self.current[0].location == const.SURFACE:
  103 + ps.Publisher().sendMessage('Render volume viewer')
  104 + else:
  105 + ps.Publisher().sendMessage('Update slice viewer')
  106 +
91 self.current = (m, mr) 107 self.current = (m, mr)
92 108
93 x, y, z = position 109 x, y, z = position