Commit 4e36387728744801ef63aa5e78f75d3fc7d60eb1

Authored by Thiago Franco de Moraes
1 parent dc38167c
Exists in watershed

Reloading all mask slice when watershed is expanded

invesalius/data/styles.py
... ... @@ -926,7 +926,9 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
926 926  
927 927  
928 928 self.viewer.slice_.current_mask.was_edited = True
929   - self.viewer.OnScrollBar(update3D=False)
  929 + Publisher.sendMessage('Reload actual slice')
  930 + else:
  931 + self.viewer.OnScrollBar(update3D=False)
930 932  
931 933 def get_coordinate_cursor(self):
932 934 # Find position
... ... @@ -1033,7 +1035,7 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
1033 1035 self.viewer.slice_.current_mask.matrix[:, :, 0] = 1
1034 1036  
1035 1037 self.viewer.slice_.discard_all_buffers()
1036   - self.viewer.OnScrollBar(update3D=False)
  1038 + Publisher.sendMessage('Reload actual slice')
1037 1039  
1038 1040  
1039 1041 def get_style(style):
... ...
invesalius/gui/task_slice.py
... ... @@ -228,7 +228,7 @@ class InnerFoldPanel(wx.Panel):
228 228 # parent panel. Perhaps we need to insert the item into the sizer also...
229 229 # Study this.
230 230 fold_panel = fpb.FoldPanelBar(self, -1, wx.DefaultPosition,
231   - (10, 240), 0,fpb.FPB_SINGLE_FOLD)
  231 + (10, 220), 0,fpb.FPB_SINGLE_FOLD)
232 232  
233 233 # Fold panel style
234 234 style = fpb.CaptionBarStyle()
... ... @@ -711,12 +711,12 @@ class EditionTools(wx.Panel):
711 711  
712 712 class WatershedTool(EditionTools):
713 713 def __init__(self, parent):
714   - wx.Panel.__init__(self, parent, size=(50,250))
  714 + wx.Panel.__init__(self, parent, size=(50,150))
715 715 default_colour = wx.SystemSettings_GetColour(wx.SYS_COLOUR_MENUBAR)
716 716 self.SetBackgroundColour(default_colour)
717 717  
718 718 ## LINE 1
719   - text1 = wx.StaticText(self, -1, _("Choose brush type, size or operation:"))
  719 + text1 = wx.StaticText(self, -1, _("Choose brush type and size:"))
720 720  
721 721 ## LINE 2
722 722 menu = wx.Menu()
... ...