From ba66372b741a5d1b09de36cffcd292fa27ae1b38 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Wed, 6 May 2015 09:35:02 -0300 Subject: [PATCH] Better sizings --- invesalius/gui/task_slice.py | 47 ++++++++++++++--------------------------------- invesalius/gui/task_surface.py | 10 +++++----- 2 files changed, 19 insertions(+), 38 deletions(-) diff --git a/invesalius/gui/task_slice.py b/invesalius/gui/task_slice.py index 05a0458..d01f753 100644 --- a/invesalius/gui/task_slice.py +++ b/invesalius/gui/task_slice.py @@ -261,19 +261,14 @@ class InnerFoldPanel(wx.Panel): item = fold_panel.AddFoldPanel(_("Mask properties"), collapsed=True) self.mask_prop_panel = MaskProperties(item) - #self.__calc_best_size(self.mask_prop_panel) - fold_panel.ApplyCaptionStyle(item, style) fold_panel.AddFoldPanelWindow(item, self.mask_prop_panel, Spacing= 0, leftSpacing=0, rightSpacing=0) - fold_panel.Expand(fold_panel.GetFoldPanel(0)) # Fold 2 - Advanced edition tools item = fold_panel.AddFoldPanel(_("Advanced editing tools"), collapsed=True) etw = EditionTools(item) - #self.__calc_best_size(etw) - fold_panel.ApplyCaptionStyle(item, style) fold_panel.AddFoldPanelWindow(item, etw, Spacing= 0, leftSpacing=0, rightSpacing=0) @@ -284,34 +279,20 @@ class InnerFoldPanel(wx.Panel): item = fold_panel.AddFoldPanel(_("Watershed"), collapsed=True) wtw = WatershedTool(item) - #self.__calc_best_size(wtw) - fold_panel.ApplyCaptionStyle(item, style) fold_panel.AddFoldPanelWindow(item, wtw, Spacing= 0, leftSpacing=0, rightSpacing=0) self.__id_watershed = item.GetId() - #fold_panel.Expand(fold_panel.GetFoldPanel(1)) - #gbs.Add(fold_panel, (0, 0), flag=wx.EXPAND) - #gbs.AddGrowableRow(0, 1) sizer.Add(fold_panel, 1, wx.EXPAND) - #w, h = self.GetSize() - #h = h + 3 * item.GetSize().GetHeight() - - print "SIZEEEEEEE", item.GetSize() - - #self.SetInitialSize((w, h)) - + fold_panel.Expand(fold_panel.GetFoldPanel(2)) self.ResizeFPB() - #self.Fit() + fold_panel.Expand(fold_panel.GetFoldPanel(0)) sizer.Layout() self.Fit() - #self.Update() - #self.SetAutoLayout(1) - self.fold_panel = fold_panel self.last_style = None @@ -394,18 +375,18 @@ class InnerFoldPanel(wx.Panel): self.fold_panel.SetSize((self.fold_panel.GetSize()[0], sizeNeeded)) print self.fold_panel.GetPanelsLength(0, 0), self.fold_panel.GetSize() - try: - #self.GetParent().GetParent().GetSizer().Layout() - #self.GetParent().GetParent().Fit() - self.GetSizer().Layout() - self.Fit() - - self.GetParent().GetSizer().Layout() - self.GetParent().Fit() - self.GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().ResizeFPB() - self.GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().Layout() - except Exception, e: - print e + #try: + ##self.GetParent().GetParent().GetSizer().Layout() + ##self.GetParent().GetParent().Fit() + #self.GetSizer().Layout() + #self.Fit() + + #self.GetParent().GetSizer().Layout() + #self.GetParent().Fit() + #self.GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().Layout() + #self.GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().ResizeFPB() + #except Exception, e: + #print e def OnRetrieveStyle(self, pubsub_evt): if (self.last_style == const.SLICE_STATE_EDITOR): diff --git a/invesalius/gui/task_surface.py b/invesalius/gui/task_surface.py index fd02901..4790360 100644 --- a/invesalius/gui/task_surface.py +++ b/invesalius/gui/task_surface.py @@ -133,7 +133,7 @@ class InnerTaskPanel(wx.Panel): def OnLinkNewSurface(self, evt=None): #import gui.dialogs as dlg sl = slice_.Slice() - dialog = dlg.SurfaceCreationDialog(None, -1, + dialog = dlg.SurfaceCreationDialog(None, -1, _('New surface'), mask_edited=sl.current_mask.was_edited) @@ -215,7 +215,6 @@ class InnerFoldPanel(wx.Panel): fold_panel.ApplyCaptionStyle(item, style) fold_panel.AddFoldPanelWindow(item, SurfaceProperties(item), Spacing= 0, leftSpacing=0, rightSpacing=0) - fold_panel.Expand(fold_panel.GetFoldPanel(0)) # Fold 2 - Surface tools item = fold_panel.AddFoldPanel(_("Advanced options"), collapsed=True) @@ -240,14 +239,16 @@ class InnerFoldPanel(wx.Panel): self.SetAutoLayout(1) + fold_panel.Expand(fold_panel.GetFoldPanel(1)) self.ResizeFPB() + fold_panel.Expand(fold_panel.GetFoldPanel(0)) def __bind_evt(self): self.fold_panel.Bind(fpb.EVT_CAPTIONBAR, self.OnFoldPressCaption) def OnFoldPressCaption(self, evt): evt.Skip() - self.ResizeFPB() + wx.CallAfter(self.ResizeFPB) def ResizeFPB(self): sizeNeeded = self.fold_panel.GetPanelsLength(0, 0)[2] @@ -349,7 +350,6 @@ class SurfaceTools(wx.Panel): # Update main sizer and panel layout self.SetSizerAndFit(main_sizer) self.Update() - self.SetAutoLayout(1) self.sizer = main_sizer def OnLinkLargest(self, evt): @@ -521,7 +521,7 @@ class SurfaceProperties(wx.Panel): self.button_colour.SetColour(colour) self.slider_transparency.SetValue(transparency) self.combo_surface_name.SetSelection(index) - Publisher.sendMessage('Update surface data', (index)) + Publisher.sendMessage('Update surface data', (index)) def OnComboName(self, evt): surface_name = evt.GetString() -- libgit2 0.21.2