Download as
Browse Code »

Commit 65bd8595ba8e39b32ee75771a9e5c182f30d0ae2

Authored by Paulo Henrique Junqueira Amorim
1 parent 338470d1
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

ENH: wx.NewId to generate the id from menu objects

Showing 1 changed file with 6 additions and 8 deletions   Show diff stats
invesalius/gui/widgets/slice_menu.py
  Diff comments   View file @65bd859
@@ -29,19 +29,19 @@ class SliceMenu(wx.Menu): @@ -29,19 +29,19 @@ class SliceMenu(wx.Menu):
29 def __init__(self): 29 def __init__(self):
30 wx.Menu.__init__(self) 30 wx.Menu.__init__(self)
31 self.ID_TO_TOOL_ITEM = {} 31 self.ID_TO_TOOL_ITEM = {}
32 - new_id = 0 32 +
33 33
34 submenu_wl = wx.Menu() 34 submenu_wl = wx.Menu()
35 for name in sorted(const.WINDOW_LEVEL): 35 for name in sorted(const.WINDOW_LEVEL):
  36 + new_id = wx.NewId()
36 wl_item = wx.MenuItem(submenu_wl, new_id,\ 37 wl_item = wx.MenuItem(submenu_wl, new_id,\
37 name, kind=wx.ITEM_RADIO) 38 name, kind=wx.ITEM_RADIO)
38 submenu_wl.AppendItem(wl_item) 39 submenu_wl.AppendItem(wl_item)
39 self.ID_TO_TOOL_ITEM[new_id] = name 40 self.ID_TO_TOOL_ITEM[new_id] = name
40 - new_id += 1  
41 41
42 submenu_pseudo_colors = wx.Menu() 42 submenu_pseudo_colors = wx.Menu()
43 for name in sorted(const.SLICE_COLOR_TABLE): 43 for name in sorted(const.SLICE_COLOR_TABLE):
44 - new_id += 1 44 + new_id = wx.NewId()
45 color_item = wx.MenuItem(submenu_wl, new_id,\ 45 color_item = wx.MenuItem(submenu_wl, new_id,\
46 name, kind=wx.ITEM_RADIO) 46 name, kind=wx.ITEM_RADIO)
47 submenu_pseudo_colors.AppendItem(color_item) 47 submenu_pseudo_colors.AppendItem(color_item)
@@ -62,18 +62,16 @@ class SliceMenu(wx.Menu): @@ -62,18 +62,16 @@ class SliceMenu(wx.Menu):
62 id = evt.GetId() 62 id = evt.GetId()
63 key = self.ID_TO_TOOL_ITEM[evt.GetId()] 63 key = self.ID_TO_TOOL_ITEM[evt.GetId()]
64 64
65 - if (id <= len(const.WINDOW_LEVEL)): 65 + if(key in const.WINDOW_LEVEL.keys()):
66 window, level = const.WINDOW_LEVEL[key] 66 window, level = const.WINDOW_LEVEL[key]
67 ps.Publisher().sendMessage('Bright and contrast adjustment image', 67 ps.Publisher().sendMessage('Bright and contrast adjustment image',
68 (window, level)) 68 (window, level))
69 ps.Publisher().sendMessage('Update slice viewer') 69 ps.Publisher().sendMessage('Update slice viewer')
70 70
71 - elif(id > len(const.WINDOW_LEVEL) and\  
72 - (id <= len(const.SLICE_COLOR_TABLE) + len(const.WINDOW_LEVEL))): 71 + elif(key in const.SLICE_COLOR_TABLE.keys()):
73 values = const.SLICE_COLOR_TABLE[key] 72 values = const.SLICE_COLOR_TABLE[key]
74 -  
75 ps.Publisher().sendMessage('Change color table from background image', values) 73 ps.Publisher().sendMessage('Change color table from background image', values)
76 ps.Publisher().sendMessage('Update slice viewer') 74 ps.Publisher().sendMessage('Update slice viewer')
77 - 75 +
78 evt.Skip() 76 evt.Skip()
79 77