Download as
Browse Code »

Commit a26fd3c8c69043417c05b2298a1137b126b99e27

Authored by Paulo Henrique Junqueira Amorim
2 parents a3b7f8c5 b37597e7
Exists in master and in 54 other branches brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, get_pixel, import_mesh, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure_canvas, measure_improvements, measure_placement_test, phoenix, region_growing_confidence, 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, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

Merge remote-tracking branch 'invesalius_master/master'

Showing 1 changed file with 32 additions and 22 deletions   Show diff stats
invesalius/gui/widgets/slice_menu.py
  Diff comments   View file @a26fd3c
... ... @@ -77,8 +77,6 @@ class SliceMenu(wx.Menu):
77 77 submenu_wl.AppendItem(wl_item)
78 78 self.ID_TO_TOOL_ITEM[new_id] = wl_item
79 79  
80   -
81   -
82 80 #----------- Sub menu of the save and load options ---------
83 81 #submenu_wl.AppendSeparator()
84 82 #options = [_("Save current values"),
... ... @@ -93,13 +91,19 @@ class SliceMenu(wx.Menu):
93 91  
94 92  
95 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 99 self.pseudo_color_items = {}
97 100 submenu_pseudo_colours = wx.Menu()
98 101 self.pseudo_color_items = {}
99 102 new_id = self.id_pseudo_first = wx.NewId()
100 103 color_item = wx.MenuItem(submenu_pseudo_colours, new_id,\
101   - _("Default "), kind=wx.ITEM_CHECK)
  104 + _("Default "), kind=mkind)
102 105 submenu_pseudo_colours.AppendItem(color_item)
  106 + color_item.Check(1)
103 107 self.ID_TO_TOOL_ITEM[new_id] = color_item
104 108 self.pseudo_color_items[new_id] = color_item
105 109  
... ... @@ -107,7 +111,7 @@ class SliceMenu(wx.Menu):
107 111 if not(name == _("Default ")):
108 112 new_id = wx.NewId()
109 113 color_item = wx.MenuItem(submenu_wl, new_id,\
110   - name, kind=wx.ITEM_CHECK)
  114 + name, kind=mkind)
111 115 submenu_pseudo_colours.AppendItem(color_item)
112 116 self.ID_TO_TOOL_ITEM[new_id] = color_item
113 117 self.pseudo_color_items[new_id] = color_item
... ... @@ -115,13 +119,15 @@ class SliceMenu(wx.Menu):
115 119 self.plist_presets = presets.get_wwwl_presets()
116 120 for name in sorted(self.plist_presets):
117 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 124 submenu_pseudo_colours.AppendItem(color_item)
120 125 self.ID_TO_TOOL_ITEM[new_id] = color_item
121 126 self.pseudo_color_items[new_id] = color_item
122 127  
123 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 131 submenu_pseudo_colours.AppendItem(color_item)
126 132 self.ID_TO_TOOL_ITEM[new_id] = color_item
127 133 self.pseudo_color_items[new_id] = color_item
... ... @@ -222,27 +228,28 @@ class SliceMenu(wx.Menu):
222 228 Publisher.sendMessage('Change colour table from background image', values)
223 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 238 self.HideClutDialog()
232 239 self._gen_event = True
233 240  
234   -
235 241 elif key in self.plist_presets:
236 242 values = presets.get_wwwl_preset_colours(self.plist_presets[key])
237 243 Publisher.sendMessage('Change colour table from background image from plist', values)
238 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 253 self.HideClutDialog()
247 254 self._gen_event = True
248 255  
... ... @@ -269,12 +276,15 @@ class SliceMenu(wx.Menu):
269 276 else:
270 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 288 self._gen_event = False
279 289  
280 290 evt.Skip()
... ...