Download as
Browse Code »

Commit 21022cf88fe192e71addce5a3f9d4944d3b513cc

Authored by Thiago Franco de Moraes
1 parent 2ff84914
Exists in select_part

Better gui

Showing 2 changed files with 34 additions and 12 deletions   Show diff stats
invesalius/data/styles.py
  Diff comments   View file @21022cf
... ... @@ -1996,8 +1996,6 @@ class SelectMaskPartsInteractorStyle(DefaultInteractorStyle):
1996 1996 bstruct = np.array(generate_binary_structure(3, CON3D[self.config.con_3d]), dtype='uint8')
1997 1997 self.viewer.slice_.do_threshold_to_all_slices()
1998 1998  
1999   - print bstruct
2000   -
2001 1999 if self.config.mask is None:
2002 2000 self._create_new_mask()
2003 2001  
... ...
invesalius/gui/dialogs.py
  Diff comments   View file @21022cf
... ... @@ -1968,19 +1968,43 @@ class SelectPartsOptionsDialog(wx.Dialog):
1968 1968 else:
1969 1969 self.conect3D_6.SetValue(1)
1970 1970  
1971   - sizer = wx.GridBagSizer(11, 6)
1972   - sizer.AddStretchSpacer((0, 0))
  1971 + sizer_t = wx.BoxSizer(wx.HORIZONTAL)
  1972 + sizer_t.AddSpacer(7)
  1973 + sizer_t.Add(wx.StaticText(self, -1, _(u"Target mask name")), 1, wx.ALIGN_CENTRE_VERTICAL)
  1974 + sizer_t.AddSpacer(7)
  1975 + sizer_t.Add(self.target_name, 1, wx.EXPAND)
  1976 + sizer_t.AddSpacer(7)
  1977 +
  1978 + sizer_c = wx.BoxSizer(wx.HORIZONTAL)
  1979 + sizer_c.AddSpacer(7)
  1980 + sizer_c.Add(self.conect3D_6)
  1981 + sizer_c.AddSpacer(7)
  1982 + sizer_c.Add(self.conect3D_18)
  1983 + sizer_c.AddSpacer(7)
  1984 + sizer_c.Add(self.conect3D_26)
  1985 +
  1986 + sizer = wx.BoxSizer(wx.VERTICAL)
  1987 + sizer.AddSpacer(7)
  1988 + sizer.Add(sizer_t, 1, wx.EXPAND)
  1989 + sizer.AddSpacer(7)
  1990 + sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), 0, wx.LEFT, 7)
  1991 + sizer.AddSpacer(5)
  1992 + sizer.Add(sizer_c)
  1993 + sizer.AddSpacer(7)
  1994 +
  1995 + # sizer = wx.GridBagSizer(11, 6)
  1996 + # sizer.AddStretchSpacer((0, 0))
1973 1997  
1974   - sizer.Add(wx.StaticText(self, -1, _(u"Target mask name")), (1, 0), (1, 2), flag=wx.LEFT, border=7)
1975   - sizer.Add(self.target_name, (1, 3), (1, 3), flag=wx.RIGHT, border=7)
  1998 + # sizer.Add(wx.StaticText(self, -1, _(u"Target mask name")), (1, 0), (1, 6), flag=wx.LEFT|wx.ALIGN_BOTTOM|wx.EXPAND, border=7)
  1999 + # sizer.Add(self.target_name, (2, 0), (1, 6), flag=wx.LEFT|wx.EXPAND|wx.RIGHT|wx.ALIGN_TOP, border=9)
1976 2000  
1977   - sizer.AddStretchSpacer((2, 0))
  2001 + # # sizer.AddStretchSpacer((3, 0))
1978 2002  
1979   - sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), (3, 0), (1, 6), flag=wx.LEFT, border=9)
1980   - sizer.Add(self.conect3D_6, (4, 0), flag=wx.LEFT, border=9)
1981   - sizer.Add(self.conect3D_18, (4, 1), flag=wx.LEFT, border=9)
1982   - sizer.Add(self.conect3D_26, (4, 2), flag=wx.LEFT, border=9)
1983   - sizer.AddStretchSpacer((5, 0))
  2003 + # sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), (3, 0), (1, 6), flag=wx.LEFT, border=7)
  2004 + # sizer.Add(self.conect3D_6, (4, 0), flag=wx.LEFT, border=9)
  2005 + # sizer.Add(self.conect3D_18, (4, 1), flag=wx.LEFT, border=9)
  2006 + # sizer.Add(self.conect3D_26, (4, 2), flag=wx.LEFT, border=9)
  2007 + # sizer.AddStretchSpacer((5, 0))
1984 2008  
1985 2009 self.SetSizer(sizer)
1986 2010 sizer.Fit(self)
... ...