Commit 65bd8595ba8e39b32ee75771a9e5c182f30d0ae2
1 parent
338470d1
Exists in
master
and in
68 other branches
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
... | ... | @@ -29,19 +29,19 @@ class SliceMenu(wx.Menu): |
29 | 29 | def __init__(self): |
30 | 30 | wx.Menu.__init__(self) |
31 | 31 | self.ID_TO_TOOL_ITEM = {} |
32 | - new_id = 0 | |
32 | + | |
33 | 33 | |
34 | 34 | submenu_wl = wx.Menu() |
35 | 35 | for name in sorted(const.WINDOW_LEVEL): |
36 | + new_id = wx.NewId() | |
36 | 37 | wl_item = wx.MenuItem(submenu_wl, new_id,\ |
37 | 38 | name, kind=wx.ITEM_RADIO) |
38 | 39 | submenu_wl.AppendItem(wl_item) |
39 | 40 | self.ID_TO_TOOL_ITEM[new_id] = name |
40 | - new_id += 1 | |
41 | 41 | |
42 | 42 | submenu_pseudo_colors = wx.Menu() |
43 | 43 | for name in sorted(const.SLICE_COLOR_TABLE): |
44 | - new_id += 1 | |
44 | + new_id = wx.NewId() | |
45 | 45 | color_item = wx.MenuItem(submenu_wl, new_id,\ |
46 | 46 | name, kind=wx.ITEM_RADIO) |
47 | 47 | submenu_pseudo_colors.AppendItem(color_item) |
... | ... | @@ -62,18 +62,16 @@ class SliceMenu(wx.Menu): |
62 | 62 | id = evt.GetId() |
63 | 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 | 66 | window, level = const.WINDOW_LEVEL[key] |
67 | 67 | ps.Publisher().sendMessage('Bright and contrast adjustment image', |
68 | 68 | (window, level)) |
69 | 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 | 72 | values = const.SLICE_COLOR_TABLE[key] |
74 | - | |
75 | 73 | ps.Publisher().sendMessage('Change color table from background image', values) |
76 | 74 | ps.Publisher().sendMessage('Update slice viewer') |
77 | - | |
75 | + | |
78 | 76 | evt.Skip() |
79 | 77 | ... | ... |