Download as
Browse Code »

Commit 4f43bf27137989e66bfde8f28ee38e8e4862e3e4

Authored by tatiana
1 parent 9cd06cb5
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

FIX: THird try on toolbar size under linux and win

Showing 3 changed files with 9 additions and 5 deletions   Show diff stats
invesalius/data/viewer_slice.py
  Diff comments   View file @4f43bf2
@@ -225,7 +225,7 @@ class Viewer(wx.Panel): @@ -225,7 +225,7 @@ class Viewer(wx.Panel):
225 text_actor = vtk.vtkActor2D() 225 text_actor = vtk.vtkActor2D()
226 text_actor.SetMapper(text_mapper) 226 text_actor.SetMapper(text_mapper)
227 text_actor.SetLayerNumber(1) 227 text_actor.SetLayerNumber(1)
228 - text_actor.GetPositionCoordinate().SetValue(20, 20) 228 + text_actor.GetPositionCoordinate().SetValue(2, 2)
229 text_actor.SetVisibility(1) 229 text_actor.SetVisibility(1)
230 230
231 ren.AddActor(actor) 231 ren.AddActor(actor)
invesalius/data/viewer_volume.py
  Diff comments   View file @4f43bf2
@@ -74,8 +74,6 @@ class Viewer(wx.Panel): @@ -74,8 +74,6 @@ class Viewer(wx.Panel):
74 74
75 def HideRaycastingVolume(self, pubsub_evt): 75 def HideRaycastingVolume(self, pubsub_evt):
76 pass 76 pass
77 -  
78 -  
79 77
80 def ChangeBackgroundColour(self, pubsub_evt): 78 def ChangeBackgroundColour(self, pubsub_evt):
81 colour = pubsub_evt.data 79 colour = pubsub_evt.data
invesalius/gui/frame.py
  Diff comments   View file @4f43bf2
@@ -258,7 +258,10 @@ class ProjectToolBar(wx.ToolBar): @@ -258,7 +258,10 @@ class ProjectToolBar(wx.ToolBar):
258 # TODO: what will appear in menubar? 258 # TODO: what will appear in menubar?
259 def __init__(self, parent): 259 def __init__(self, parent):
260 wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT|wx.TB_NODIVIDER) 260 wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT|wx.TB_NODIVIDER)
261 - self.SetToolBitmapSize(wx.Size(25,25)) 261 + if sys.platform == 'darwin':
  262 + self.SetToolBitmapSize(wx.Size(25,25))
  263 + else:
  264 + self.SetToolBitmapSize(wx.Size(16,16))
262 self.parent = parent 265 self.parent = parent
263 self.__init_items() 266 self.__init_items()
264 self.__bind_events() 267 self.__bind_events()
@@ -284,7 +287,10 @@ class ObjectToolBar(wx.ToolBar): @@ -284,7 +287,10 @@ class ObjectToolBar(wx.ToolBar):
284 # TODO: what will appear in menubar? 287 # TODO: what will appear in menubar?
285 def __init__(self, parent): 288 def __init__(self, parent):
286 wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT|wx.TB_NODIVIDER) 289 wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT|wx.TB_NODIVIDER)
287 - self.SetToolBitmapSize(wx.Size(25,25)) 290 + if sys.platform == 'darwin':
  291 + self.SetToolBitmapSize(wx.Size(25,25))
  292 + else:
  293 + self.SetToolBitmapSize(wx.Size(16,16))
288 self.parent = parent 294 self.parent = parent
289 self.__init_items() 295 self.__init_items()
290 self.__bind_events() 296 self.__bind_events()