Download as
Browse Code »

Commit 74061db14f45ed86c967d906f9aa6f3dcd70c271

Authored by tatiana
1 parent 9f6c35ce
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: Menus on raycasting and orientation are working now

Showing 2 changed files with 20 additions and 14 deletions   Show diff stats
invesalius/control.py
  Diff comments   View file @74061db
... ... @@ -109,8 +109,6 @@ class Controller():
109 109  
110 110 ps.Publisher().sendMessage('Update AUI')
111 111  
112   - ps.Publisher().sendMessage('TESTE TATI')
113   -
114 112  
115 113 def LoadImagedataInfo(self):
116 114 proj = prj.Project()
... ...
invesalius/gui/default_viewers.py
  Diff comments   View file @74061db
... ... @@ -200,13 +200,16 @@ class VolumeViewerCover(wx.Panel):
200 200  
201 201 sizer = wx.BoxSizer(wx.HORIZONTAL)
202 202 sizer.Add(volume_viewer.Viewer(self), 1, wx.EXPAND|wx.GROW)
203   - sizer.Add(VolumeToolPanel(self), 0, wx.EXPAND)
204   - self.SetSizer(sizer)
  203 + sizer.Add(VolumeToolPanel(self), 0, wx.EXPAND|wx.GROW)
205 204 sizer.Fit(self)
206 205  
  206 + self.SetSizer(sizer)
  207 + self.Update()
  208 + self.SetAutoLayout(1)
  209 +
207 210 class VolumeToolPanel(wx.Panel):
208 211 def __init__(self, parent):
209   - wx.Panel.__init__(self, parent, size = (8,100))
  212 + wx.Panel.__init__(self, parent, size = (10,100))
210 213  
211 214 # VOLUME RAYCASTING BUTTON
212 215 BMP_RAYCASTING = wx.Bitmap("../icons/volume_raycasting.png",
... ... @@ -232,26 +235,31 @@ class VolumeToolPanel(wx.Panel):
232 235 button_colour.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour)
233 236 self.button_colour = button_colour
234 237  
235   - self.__bind_events()
  238 + sizer_colour = wx.BoxSizer(wx.HORIZONTAL)
  239 + sizer_colour.Add(button_colour, 0, wx.RIGHT, 15)
236 240  
237 241 # SIZER TO ORGANIZE ALL
238 242 sizer = wx.BoxSizer(wx.VERTICAL)
239   - sizer.Add(button_colour, 0, wx.ALL, 1)
240   - sizer.Add(button_raycasting, 0, wx.ALL, 1)
241   - sizer.Add(button_view, 0, wx.ALL, 1)
242   - self.SetSizer(sizer)
  243 + sizer.Add(button_raycasting, 0, wx.TOP|wx.BOTTOM, 1)
  244 + sizer.Add(button_view, 0, wx.TOP|wx.BOTTOM, 1)
  245 + #sizer.AddStretchSpacer()
  246 + sizer.Add(sizer_colour, 0, wx.ALL, 5)
243 247 sizer.Fit(self)
244 248  
  249 + self.__init_menus()
  250 +
  251 + self.SetSizer(sizer)
  252 + self.SetAutoLayout(1)
  253 + self.Update()
  254 + self.Refresh()
  255 +
245 256 self.__bind_events()
246 257  
247 258 def __bind_events(self):
248 259 ps.Publisher().subscribe(self.ChangeButtonColour,
249 260 'Change volume viewer gui colour')
250   - ps.Publisher().subscribe(self.__init_menus, 'TESTE TATI')
251 261  
252 262 def __init_menus(self, pubsub_evt=None):
253   - print "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
254   - print "__init_menus"
255 263 # MENU RELATED TO RAYCASTING TYPES
256 264 menu = wx.Menu()
257 265 for name in const.RAYCASTING_TYPES:
... ... @@ -291,8 +299,8 @@ class VolumeToolPanel(wx.Panel):
291 299 self.menu_view = menu
292 300 self.button_view.SetMenu(menu)
293 301  
  302 + self.Fit()
294 303 self.Update()
295   - self.Refresh()
296 304  
297 305 def ChangeButtonColour(self, pubsub_evt):
298 306 colour = [i*255 for i in pubsub_evt.data]
... ...