Download as
Browse Code »

Commit e6b203530634385d6a53ecc6ac25c17fe1616991

Authored by Thiago Franco de Moraes
1 parent 449b32c1
Exists in ffill_gui

Better sizers

Showing 1 changed file with 19 additions and 53 deletions   Show diff stats
invesalius/gui/dialogs.py
  Diff comments   View file @e6b2035
... ... @@ -2033,67 +2033,33 @@ class SelectPartsOptionsDialog(wx.Dialog):
2033 2033 self.target_name.SetValue(self.config.mask_name)
2034 2034  
2035 2035 # Connectivity 3D
2036   - self.conect3D_6 = wx.RadioButton(self, -1, "6", style=wx.RB_GROUP)
2037   - self.conect3D_18 = wx.RadioButton(self, -1, "18")
2038   - self.conect3D_26 = wx.RadioButton(self, -1, "26")
2039   -
  2036 + self.panel3dcon = Panel3DConnectivity(self)
2040 2037 if self.config.con_3d == 18:
2041   - self.conect3D_18.SetValue(1)
  2038 + self.panel3dcon.conect3D_18.SetValue(1)
2042 2039 elif self.config.con_3d == 26:
2043   - self.conect3D_26.SetValue(1)
  2040 + self.panel3dcon.conect3D_26.SetValue(1)
2044 2041 else:
2045   - self.conect3D_6.SetValue(1)
  2042 + self.panel3dcon.conect3D_6.SetValue(1)
2046 2043  
2047 2044 self.btn_ok = wx.Button(self, wx.ID_OK)
2048 2045 self.btn_cancel = wx.Button(self, wx.ID_CANCEL)
2049 2046  
2050   - # sizer_t = wx.BoxSizer(wx.HORIZONTAL)
2051   - # sizer_t.AddSpacer(7)
2052   - # sizer_t.Add(wx.StaticText(self, -1, _(u"Target mask name")), 1, wx.ALIGN_CENTRE_VERTICAL)
2053   - # sizer_t.AddSpacer(7)
2054   - # sizer_t.Add(self.target_name, 1, wx.EXPAND)
2055   - # sizer_t.AddSpacer(7)
2056   -
2057   - # sizer_c = wx.BoxSizer(wx.HORIZONTAL)
2058   - # sizer_c.AddSpacer(7)
2059   - # sizer_c.Add(self.conect3D_6)
2060   - # sizer_c.AddSpacer(7)
2061   - # sizer_c.Add(self.conect3D_18)
2062   - # sizer_c.AddSpacer(7)
2063   - # sizer_c.Add(self.conect3D_26)
2064   -
2065   - # sizer = wx.BoxSizer(wx.VERTICAL)
2066   - # sizer.AddSpacer(7)
2067   - # sizer.Add(sizer_t, 1, wx.EXPAND)
2068   - # sizer.AddSpacer(7)
2069   - # sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), 0, wx.LEFT, 7)
2070   - # sizer.AddSpacer(5)
2071   - # sizer.Add(sizer_c)
2072   - # sizer.AddSpacer(7)
2073   -
2074   - sizer = wx.GridBagSizer(5, 5)
2075   -
2076   - sizer.AddStretchSpacer((0, 0))
2077   -
2078   - sizer.Add(wx.StaticText(self, -1, _(u"Target mask name")), (1, 0), (1, 6), flag=wx.LEFT|wx.ALIGN_BOTTOM|wx.EXPAND, border=5)
2079   - sizer.Add(self.target_name, (2, 0), (1, 6), flag=wx.LEFT|wx.EXPAND|wx.RIGHT|wx.ALIGN_TOP, border=9)
2080   -
2081   - sizer.AddStretchSpacer((3, 0))
2082   -
2083   - sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), (4, 0), (1, 6), flag=wx.LEFT, border=5)
2084   - sizer.Add(self.conect3D_6, (5, 0), flag=wx.LEFT, border=9)
2085   - sizer.Add(self.conect3D_18, (5, 1), flag=wx.LEFT, border=9)
2086   - sizer.Add(self.conect3D_26, (5, 2), flag=wx.LEFT, border=9)
  2047 + sizer = wx.BoxSizer(wx.VERTICAL)
2087 2048  
2088   - sizer.AddStretchSpacer((6, 0))
  2049 + sizer.AddSpacer(5)
  2050 + sizer.Add(wx.StaticText(self, -1, _(u"Target mask name")), flag=wx.LEFT, border=5)
  2051 + sizer.AddSpacer(5)
  2052 + sizer.Add(self.target_name, flag=wx.LEFT|wx.EXPAND|wx.RIGHT, border=9)
  2053 + sizer.AddSpacer(5)
  2054 + sizer.Add(self.panel3dcon, flag=wx.LEFT|wx.RIGHT|wx.EXPAND)
  2055 + sizer.AddSpacer(5)
2089 2056  
2090 2057 btn_sizer = wx.BoxSizer(wx.HORIZONTAL)
2091   - btn_sizer.Add(self.btn_ok, 0, flag=wx.RIGHT|wx.ALIGN_RIGHT, border=5)
2092   - btn_sizer.Add(self.btn_cancel, 0, flag=wx.RIGHT|wx.ALIGN_RIGHT, border=5)
2093   -
2094   - sizer.AddSizer(btn_sizer, (7, 0), (1, 6), flag=wx.EXPAND|wx.RIGHT|wx.LEFT|wx.ALIGN_RIGHT, border=5)
  2058 + btn_sizer.Add(self.btn_ok, 0, flag=wx.ALIGN_RIGHT, border=5)
  2059 + btn_sizer.Add(self.btn_cancel, 0, flag=wx.LEFT|wx.ALIGN_RIGHT, border=5)
2095 2060  
2096   - sizer.AddStretchSpacer((8, 0))
  2061 + sizer.AddSizer(btn_sizer, 0, flag=wx.ALIGN_RIGHT|wx.LEFT|wx.RIGHT, border=5)
  2062 + sizer.AddSpacer(5)
2097 2063  
2098 2064 self.SetSizer(sizer)
2099 2065 sizer.Fit(self)
... ... @@ -2119,11 +2085,11 @@ class SelectPartsOptionsDialog(wx.Dialog):
2119 2085 self.config.mask_name = self.target_name.GetValue()
2120 2086  
2121 2087 def OnSetRadio(self, evt):
2122   - if self.conect3D_6.GetValue():
  2088 + if self.panel3dcon.conect3D_6.GetValue():
2123 2089 self.config.con_3d = 6
2124   - elif self.conect3D_18.GetValue():
  2090 + elif self.panel3dcon.conect3D_18.GetValue():
2125 2091 self.config.con_3d = 18
2126   - elif self.conect3D_26.GetValue():
  2092 + elif self.panel3dcon.conect3D_26.GetValue():
2127 2093 self.config.con_3d = 26
2128 2094  
2129 2095 def OnClose(self, evt):
... ...