Commit 9397c5f8e49fa30fbd22d1bd8ebdda29d57ad971
1 parent
abf558df
Exists in
master
and in
54 other branches
Only using checkbox to linux in slice color menu
Showing
1 changed file
with
32 additions
and
22 deletions
Show diff stats
invesalius/gui/widgets/slice_menu.py
@@ -77,8 +77,6 @@ class SliceMenu(wx.Menu): | @@ -77,8 +77,6 @@ class SliceMenu(wx.Menu): | ||
77 | submenu_wl.AppendItem(wl_item) | 77 | submenu_wl.AppendItem(wl_item) |
78 | self.ID_TO_TOOL_ITEM[new_id] = wl_item | 78 | self.ID_TO_TOOL_ITEM[new_id] = wl_item |
79 | 79 | ||
80 | - | ||
81 | - | ||
82 | #----------- Sub menu of the save and load options --------- | 80 | #----------- Sub menu of the save and load options --------- |
83 | #submenu_wl.AppendSeparator() | 81 | #submenu_wl.AppendSeparator() |
84 | #options = [_("Save current values"), | 82 | #options = [_("Save current values"), |
@@ -93,13 +91,19 @@ class SliceMenu(wx.Menu): | @@ -93,13 +91,19 @@ class SliceMenu(wx.Menu): | ||
93 | 91 | ||
94 | 92 | ||
95 | #------------ Sub menu of the pseudo colors ---------------- | 93 | #------------ Sub menu of the pseudo colors ---------------- |
94 | + if sys.platform == 'linux2': | ||
95 | + mkind = wx.ITEM_CHECK | ||
96 | + else: | ||
97 | + mkind = wx.ITEM_RADIO | ||
98 | + | ||
96 | self.pseudo_color_items = {} | 99 | self.pseudo_color_items = {} |
97 | submenu_pseudo_colours = wx.Menu() | 100 | submenu_pseudo_colours = wx.Menu() |
98 | self.pseudo_color_items = {} | 101 | self.pseudo_color_items = {} |
99 | new_id = self.id_pseudo_first = wx.NewId() | 102 | new_id = self.id_pseudo_first = wx.NewId() |
100 | color_item = wx.MenuItem(submenu_pseudo_colours, new_id,\ | 103 | color_item = wx.MenuItem(submenu_pseudo_colours, new_id,\ |
101 | - _("Default "), kind=wx.ITEM_CHECK) | 104 | + _("Default "), kind=mkind) |
102 | submenu_pseudo_colours.AppendItem(color_item) | 105 | submenu_pseudo_colours.AppendItem(color_item) |
106 | + color_item.Check(1) | ||
103 | self.ID_TO_TOOL_ITEM[new_id] = color_item | 107 | self.ID_TO_TOOL_ITEM[new_id] = color_item |
104 | self.pseudo_color_items[new_id] = color_item | 108 | self.pseudo_color_items[new_id] = color_item |
105 | 109 | ||
@@ -107,7 +111,7 @@ class SliceMenu(wx.Menu): | @@ -107,7 +111,7 @@ class SliceMenu(wx.Menu): | ||
107 | if not(name == _("Default ")): | 111 | if not(name == _("Default ")): |
108 | new_id = wx.NewId() | 112 | new_id = wx.NewId() |
109 | color_item = wx.MenuItem(submenu_wl, new_id,\ | 113 | color_item = wx.MenuItem(submenu_wl, new_id,\ |
110 | - name, kind=wx.ITEM_CHECK) | 114 | + name, kind=mkind) |
111 | submenu_pseudo_colours.AppendItem(color_item) | 115 | submenu_pseudo_colours.AppendItem(color_item) |
112 | self.ID_TO_TOOL_ITEM[new_id] = color_item | 116 | self.ID_TO_TOOL_ITEM[new_id] = color_item |
113 | self.pseudo_color_items[new_id] = color_item | 117 | self.pseudo_color_items[new_id] = color_item |
@@ -115,13 +119,15 @@ class SliceMenu(wx.Menu): | @@ -115,13 +119,15 @@ class SliceMenu(wx.Menu): | ||
115 | self.plist_presets = presets.get_wwwl_presets() | 119 | self.plist_presets = presets.get_wwwl_presets() |
116 | for name in sorted(self.plist_presets): | 120 | for name in sorted(self.plist_presets): |
117 | new_id = wx.NewId() | 121 | new_id = wx.NewId() |
118 | - color_item = wx.MenuItem(submenu_wl, new_id, name, kind=wx.ITEM_CHECK) | 122 | + color_item = wx.MenuItem(submenu_wl, new_id, name, |
123 | + kind=mkind) | ||
119 | submenu_pseudo_colours.AppendItem(color_item) | 124 | submenu_pseudo_colours.AppendItem(color_item) |
120 | self.ID_TO_TOOL_ITEM[new_id] = color_item | 125 | self.ID_TO_TOOL_ITEM[new_id] = color_item |
121 | self.pseudo_color_items[new_id] = color_item | 126 | self.pseudo_color_items[new_id] = color_item |
122 | 127 | ||
123 | new_id = wx.NewId() | 128 | new_id = wx.NewId() |
124 | - color_item = wx.MenuItem(submenu_wl, new_id, _('Custom')) | 129 | + color_item = wx.MenuItem(submenu_wl, new_id, _('Custom'), |
130 | + kind=mkind) | ||
125 | submenu_pseudo_colours.AppendItem(color_item) | 131 | submenu_pseudo_colours.AppendItem(color_item) |
126 | self.ID_TO_TOOL_ITEM[new_id] = color_item | 132 | self.ID_TO_TOOL_ITEM[new_id] = color_item |
127 | self.pseudo_color_items[new_id] = color_item | 133 | self.pseudo_color_items[new_id] = color_item |
@@ -222,27 +228,28 @@ class SliceMenu(wx.Menu): | @@ -222,27 +228,28 @@ class SliceMenu(wx.Menu): | ||
222 | Publisher.sendMessage('Change colour table from background image', values) | 228 | Publisher.sendMessage('Change colour table from background image', values) |
223 | Publisher.sendMessage('Update slice viewer') | 229 | Publisher.sendMessage('Update slice viewer') |
224 | 230 | ||
225 | - for i in self.pseudo_color_items: | ||
226 | - it = self.pseudo_color_items[i] | ||
227 | - if it.IsChecked(): | ||
228 | - it.Toggle() | 231 | + if sys.platform == 'linux2': |
232 | + for i in self.pseudo_color_items: | ||
233 | + it = self.pseudo_color_items[i] | ||
234 | + if it.IsChecked(): | ||
235 | + it.Toggle() | ||
229 | 236 | ||
230 | - item.Toggle() | 237 | + item.Toggle() |
231 | self.HideClutDialog() | 238 | self.HideClutDialog() |
232 | self._gen_event = True | 239 | self._gen_event = True |
233 | 240 | ||
234 | - | ||
235 | elif key in self.plist_presets: | 241 | elif key in self.plist_presets: |
236 | values = presets.get_wwwl_preset_colours(self.plist_presets[key]) | 242 | values = presets.get_wwwl_preset_colours(self.plist_presets[key]) |
237 | Publisher.sendMessage('Change colour table from background image from plist', values) | 243 | Publisher.sendMessage('Change colour table from background image from plist', values) |
238 | Publisher.sendMessage('Update slice viewer') | 244 | Publisher.sendMessage('Update slice viewer') |
239 | 245 | ||
240 | - for i in self.pseudo_color_items: | ||
241 | - it = self.pseudo_color_items[i] | ||
242 | - if it.IsChecked(): | ||
243 | - it.Toggle() | 246 | + if sys.platform == 'linux2': |
247 | + for i in self.pseudo_color_items: | ||
248 | + it = self.pseudo_color_items[i] | ||
249 | + if it.IsChecked(): | ||
250 | + it.Toggle() | ||
244 | 251 | ||
245 | - item.Toggle() | 252 | + item.Toggle() |
246 | self.HideClutDialog() | 253 | self.HideClutDialog() |
247 | self._gen_event = True | 254 | self._gen_event = True |
248 | 255 | ||
@@ -269,12 +276,15 @@ class SliceMenu(wx.Menu): | @@ -269,12 +276,15 @@ class SliceMenu(wx.Menu): | ||
269 | else: | 276 | else: |
270 | self.cdialog.Show(self._gen_event) | 277 | self.cdialog.Show(self._gen_event) |
271 | 278 | ||
272 | - for i in self.pseudo_color_items: | ||
273 | - it = self.pseudo_color_items[i] | ||
274 | - if it.IsChecked(): | ||
275 | - it.Toggle() | 279 | + if sys.platform == 'linux2': |
280 | + for i in self.pseudo_color_items: | ||
281 | + it = self.pseudo_color_items[i] | ||
282 | + if it.IsChecked(): | ||
283 | + it.Toggle() | ||
276 | 284 | ||
277 | - item.Toggle() | 285 | + item.Toggle() |
286 | + item = self.ID_TO_TOOL_ITEM[evt.GetId()] | ||
287 | + item.Check(True) | ||
278 | self._gen_event = False | 288 | self._gen_event = False |
279 | 289 | ||
280 | evt.Skip() | 290 | evt.Skip() |