Download as
Browse Code »

Commit ba66372b741a5d1b09de36cffcd292fa27ae1b38

Authored by Thiago Franco de Moraes
1 parent 65d126f8
Exists in wxgtk3_bkp

Better sizings

Showing 2 changed files with 19 additions and 38 deletions   Show diff stats
invesalius/gui/task_slice.py
  Diff comments   View file @ba66372
... ... @@ -261,19 +261,14 @@ class InnerFoldPanel(wx.Panel):
261 261 item = fold_panel.AddFoldPanel(_("Mask properties"), collapsed=True)
262 262 self.mask_prop_panel = MaskProperties(item)
263 263  
264   - #self.__calc_best_size(self.mask_prop_panel)
265   -
266 264 fold_panel.ApplyCaptionStyle(item, style)
267 265 fold_panel.AddFoldPanelWindow(item, self.mask_prop_panel, Spacing= 0,
268 266 leftSpacing=0, rightSpacing=0)
269   - fold_panel.Expand(fold_panel.GetFoldPanel(0))
270 267  
271 268 # Fold 2 - Advanced edition tools
272 269 item = fold_panel.AddFoldPanel(_("Advanced editing tools"), collapsed=True)
273 270 etw = EditionTools(item)
274 271  
275   - #self.__calc_best_size(etw)
276   -
277 272 fold_panel.ApplyCaptionStyle(item, style)
278 273 fold_panel.AddFoldPanelWindow(item, etw, Spacing= 0,
279 274 leftSpacing=0, rightSpacing=0)
... ... @@ -284,34 +279,20 @@ class InnerFoldPanel(wx.Panel):
284 279 item = fold_panel.AddFoldPanel(_("Watershed"), collapsed=True)
285 280 wtw = WatershedTool(item)
286 281  
287   - #self.__calc_best_size(wtw)
288   -
289 282 fold_panel.ApplyCaptionStyle(item, style)
290 283 fold_panel.AddFoldPanelWindow(item, wtw, Spacing= 0,
291 284 leftSpacing=0, rightSpacing=0)
292 285 self.__id_watershed = item.GetId()
293 286  
294   - #fold_panel.Expand(fold_panel.GetFoldPanel(1))
295   - #gbs.Add(fold_panel, (0, 0), flag=wx.EXPAND)
296   - #gbs.AddGrowableRow(0, 1)
297 287 sizer.Add(fold_panel, 1, wx.EXPAND)
298 288  
299   - #w, h = self.GetSize()
300   - #h = h + 3 * item.GetSize().GetHeight()
301   -
302   - print "SIZEEEEEEE", item.GetSize()
303   -
304   - #self.SetInitialSize((w, h))
305   -
  289 + fold_panel.Expand(fold_panel.GetFoldPanel(2))
306 290 self.ResizeFPB()
307   - #self.Fit()
  291 + fold_panel.Expand(fold_panel.GetFoldPanel(0))
308 292  
309 293 sizer.Layout()
310 294 self.Fit()
311 295  
312   - #self.Update()
313   - #self.SetAutoLayout(1)
314   -
315 296 self.fold_panel = fold_panel
316 297 self.last_style = None
317 298  
... ... @@ -394,18 +375,18 @@ class InnerFoldPanel(wx.Panel):
394 375 self.fold_panel.SetSize((self.fold_panel.GetSize()[0], sizeNeeded))
395 376 print self.fold_panel.GetPanelsLength(0, 0), self.fold_panel.GetSize()
396 377  
397   - try:
398   - #self.GetParent().GetParent().GetSizer().Layout()
399   - #self.GetParent().GetParent().Fit()
400   - self.GetSizer().Layout()
401   - self.Fit()
402   -
403   - self.GetParent().GetSizer().Layout()
404   - self.GetParent().Fit()
405   - self.GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().ResizeFPB()
406   - self.GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().Layout()
407   - except Exception, e:
408   - print e
  378 + #try:
  379 + ##self.GetParent().GetParent().GetSizer().Layout()
  380 + ##self.GetParent().GetParent().Fit()
  381 + #self.GetSizer().Layout()
  382 + #self.Fit()
  383 +
  384 + #self.GetParent().GetSizer().Layout()
  385 + #self.GetParent().Fit()
  386 + #self.GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().Layout()
  387 + #self.GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().ResizeFPB()
  388 + #except Exception, e:
  389 + #print e
409 390  
410 391 def OnRetrieveStyle(self, pubsub_evt):
411 392 if (self.last_style == const.SLICE_STATE_EDITOR):
... ...
invesalius/gui/task_surface.py
  Diff comments   View file @ba66372
... ... @@ -133,7 +133,7 @@ class InnerTaskPanel(wx.Panel):
133 133 def OnLinkNewSurface(self, evt=None):
134 134 #import gui.dialogs as dlg
135 135 sl = slice_.Slice()
136   - dialog = dlg.SurfaceCreationDialog(None, -1,
  136 + dialog = dlg.SurfaceCreationDialog(None, -1,
137 137 _('New surface'),
138 138 mask_edited=sl.current_mask.was_edited)
139 139  
... ... @@ -215,7 +215,6 @@ class InnerFoldPanel(wx.Panel):
215 215 fold_panel.ApplyCaptionStyle(item, style)
216 216 fold_panel.AddFoldPanelWindow(item, SurfaceProperties(item), Spacing= 0,
217 217 leftSpacing=0, rightSpacing=0)
218   - fold_panel.Expand(fold_panel.GetFoldPanel(0))
219 218  
220 219 # Fold 2 - Surface tools
221 220 item = fold_panel.AddFoldPanel(_("Advanced options"), collapsed=True)
... ... @@ -240,14 +239,16 @@ class InnerFoldPanel(wx.Panel):
240 239 self.SetAutoLayout(1)
241 240  
242 241  
  242 + fold_panel.Expand(fold_panel.GetFoldPanel(1))
243 243 self.ResizeFPB()
  244 + fold_panel.Expand(fold_panel.GetFoldPanel(0))
244 245  
245 246 def __bind_evt(self):
246 247 self.fold_panel.Bind(fpb.EVT_CAPTIONBAR, self.OnFoldPressCaption)
247 248  
248 249 def OnFoldPressCaption(self, evt):
249 250 evt.Skip()
250   - self.ResizeFPB()
  251 + wx.CallAfter(self.ResizeFPB)
251 252  
252 253 def ResizeFPB(self):
253 254 sizeNeeded = self.fold_panel.GetPanelsLength(0, 0)[2]
... ... @@ -349,7 +350,6 @@ class SurfaceTools(wx.Panel):
349 350 # Update main sizer and panel layout
350 351 self.SetSizerAndFit(main_sizer)
351 352 self.Update()
352   - self.SetAutoLayout(1)
353 353 self.sizer = main_sizer
354 354  
355 355 def OnLinkLargest(self, evt):
... ... @@ -521,7 +521,7 @@ class SurfaceProperties(wx.Panel):
521 521 self.button_colour.SetColour(colour)
522 522 self.slider_transparency.SetValue(transparency)
523 523 self.combo_surface_name.SetSelection(index)
524   - Publisher.sendMessage('Update surface data', (index))
  524 + Publisher.sendMessage('Update surface data', (index))
525 525  
526 526 def OnComboName(self, evt):
527 527 surface_name = evt.GetString()
... ...