Commit 8ece37b8d2011137ac27476bc281aa660ecfb877

Authored by tatiana
1 parent 9c879342

ENH: Win32 gui text

invesalius/gui/data_notebook.py
@@ -120,6 +120,8 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): @@ -120,6 +120,8 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
120 120
121 if sys.platform != 'win32': 121 if sys.platform != 'win32':
122 self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL) 122 self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
  123 + else:
  124 + self.SetImageList(self.imagelist)
123 125
124 self.image_gray = Image.open("../icons/object_colour.jpg") 126 self.image_gray = Image.open("../icons/object_colour.jpg")
125 127
@@ -375,6 +377,9 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): @@ -375,6 +377,9 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
375 377
376 if sys.platform != 'win32': 378 if sys.platform != 'win32':
377 self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL) 379 self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
  380 + else:
  381 + self.SetImageList(self.imagelist)
  382 +
378 383
379 def OnItemActivated(self, evt): 384 def OnItemActivated(self, evt):
380 self.ToggleItem(evt.m_itemIndex) 385 self.ToggleItem(evt.m_itemIndex)
@@ -457,6 +462,9 @@ class AnnotationsListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): @@ -457,6 +462,9 @@ class AnnotationsListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
457 462
458 if sys.platform != 'win32': 463 if sys.platform != 'win32':
459 self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL) 464 self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
  465 + else:
  466 + self.SetImageList(self.imagelist)
  467 +
460 468
461 def OnItemActivated(self, evt): 469 def OnItemActivated(self, evt):
462 self.ToggleItem(evt.m_itemIndex) 470 self.ToggleItem(evt.m_itemIndex)
invesalius/gui/task_slice.py
@@ -408,7 +408,7 @@ class EditionTools(wx.Panel): @@ -408,7 +408,7 @@ class EditionTools(wx.Panel):
408 btn_brush_format.SetMenu(menu) 408 btn_brush_format.SetMenu(menu)
409 self.btn_brush_format = btn_brush_format 409 self.btn_brush_format = btn_brush_format
410 410
411 - spin_brush_size = wx.SpinCtrl(self, -1, "", (30, 50)) 411 + spin_brush_size = wx.SpinCtrl(self, -1, "", (20, 50))
412 spin_brush_size.SetRange(1,100) 412 spin_brush_size.SetRange(1,100)
413 spin_brush_size.SetValue(const.BRUSH_SIZE) 413 spin_brush_size.SetValue(const.BRUSH_SIZE)
414 spin_brush_size.Bind(wx.EVT_TEXT, self.OnBrushSize) 414 spin_brush_size.Bind(wx.EVT_TEXT, self.OnBrushSize)
@@ -426,7 +426,7 @@ class EditionTools(wx.Panel): @@ -426,7 +426,7 @@ class EditionTools(wx.Panel):
426 line2 = wx.BoxSizer(wx.HORIZONTAL) 426 line2 = wx.BoxSizer(wx.HORIZONTAL)
427 line2.Add(btn_brush_format, 0, wx.EXPAND|wx.GROW|wx.TOP|wx.RIGHT, 0) 427 line2.Add(btn_brush_format, 0, wx.EXPAND|wx.GROW|wx.TOP|wx.RIGHT, 0)
428 line2.Add(spin_brush_size, 0, wx.RIGHT, 5) 428 line2.Add(spin_brush_size, 0, wx.RIGHT, 5)
429 - line2.Add(combo_brush_op, 1, wx.TOP|wx.RIGHT|wx.LEFT, 5) 429 + line2.Add(combo_brush_op, 1, wx.EXPAND|wx.TOP|wx.RIGHT|wx.LEFT, 5)
430 430
431 ## LINE 3 431 ## LINE 3
432 text_thresh = wx.StaticText(self, -1, "Brush threshold range:") 432 text_thresh = wx.StaticText(self, -1, "Brush threshold range:")