Download as
Browse Code »

Commit b76426df19b5e5b716608d37e37d6e240c1c06b1

Authored by Thiago Franco de Moraes
1 parent 314371db
Exists in ffill_gui

Close button

Showing 1 changed file with 29 additions and 11 deletions   Show diff stats
invesalius/gui/dialogs.py
  Diff comments   View file @b76426d
... ... @@ -1849,10 +1849,12 @@ class PanelTargeFFill(wx.Panel):
1849 1849 self.target_2d = wx.RadioButton(self, -1, _(u"2D - Actual slice"), style=wx.RB_GROUP)
1850 1850 self.target_3d = wx.RadioButton(self, -1, _(u"3D - All slices"))
1851 1851  
1852   - sizer = wx.GridBagSizer(10)
  1852 + sizer = wx.GridBagSizer(5, 5)
1853 1853  
1854   - sizer.Add(self.target_2d, (0, 0), (1, 6), flag=wx.LEFT, border=5)
1855   - sizer.Add(self.target_3d, (1, 0), (1, 6), flag=wx.LEFT, border=5)
  1854 + sizer.AddStretchSpacer((0, 0))
  1855 + sizer.Add(self.target_2d, (1, 0), (1, 6), flag=wx.LEFT, border=5)
  1856 + sizer.Add(self.target_3d, (2, 0), (1, 6), flag=wx.LEFT, border=5)
  1857 + sizer.AddStretchSpacer((3, 0))
1856 1858  
1857 1859 self.SetSizer(sizer)
1858 1860 sizer.Fit(self)
... ... @@ -1867,11 +1869,13 @@ class Panel2DConnectivity(wx.Panel):
1867 1869 self.conect2D_4 = wx.RadioButton(self, -1, "4", style=wx.RB_GROUP)
1868 1870 self.conect2D_8 = wx.RadioButton(self, -1, "8")
1869 1871  
1870   - sizer = wx.GridBagSizer(10)
  1872 + sizer = wx.GridBagSizer(5, 5)
1871 1873  
1872   - sizer.Add(wx.StaticText(self, -1, _(u"2D Connectivity")), (0, 0), (1, 6), flag=wx.LEFT, border=5)
1873   - sizer.Add(self.conect2D_4, (1, 0), flag=wx.LEFT, border=7)
1874   - sizer.Add(self.conect2D_8, (1, 1), flag=wx.LEFT, border=7)
  1874 + sizer.AddStretchSpacer((0, 0))
  1875 + sizer.Add(wx.StaticText(self, -1, _(u"2D Connectivity")), (1, 0), (1, 6), flag=wx.LEFT, border=5)
  1876 + sizer.Add(self.conect2D_4, (2, 0), flag=wx.LEFT, border=7)
  1877 + sizer.Add(self.conect2D_8, (2, 1), flag=wx.LEFT, border=7)
  1878 + sizer.AddStretchSpacer((3, 0))
1875 1879  
1876 1880 self.SetSizer(sizer)
1877 1881 sizer.Fit(self)
... ... @@ -1890,10 +1894,12 @@ class Panel3DConnectivity(wx.Panel):
1890 1894  
1891 1895 sizer = wx.GridBagSizer(5, 5)
1892 1896  
1893   - sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), (0, 0), (1, 6), flag=wx.LEFT, border=5)
1894   - sizer.Add(self.conect3D_6, (1, 0), flag=wx.LEFT, border=9)
1895   - sizer.Add(self.conect3D_18, (1, 1), flag=wx.LEFT, border=9)
1896   - sizer.Add(self.conect3D_26, (1, 2), flag=wx.LEFT, border=9)
  1897 + sizer.AddStretchSpacer((0, 0))
  1898 + sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), (1, 0), (1, 6), flag=wx.LEFT, border=5)
  1899 + sizer.Add(self.conect3D_6, (2, 0), flag=wx.LEFT, border=9)
  1900 + sizer.Add(self.conect3D_18, (2, 1), flag=wx.LEFT, border=9)
  1901 + sizer.Add(self.conect3D_26, (2, 2), flag=wx.LEFT, border=9)
  1902 + sizer.AddStretchSpacer((3, 0))
1897 1903  
1898 1904 self.SetSizer(sizer)
1899 1905 sizer.Fit(self)
... ... @@ -1941,9 +1947,14 @@ class FFillOptionsDialog(wx.Dialog):
1941 1947 else:
1942 1948 self.panel3dcon.conect3D_6.SetValue(1)
1943 1949  
  1950 + self.close_btn = wx.Button(self, wx.ID_CLOSE)
  1951 + # btn_sizer = self.CreateStdDialogButtonSizer(wx.CLOSE)
  1952 + # btn_sizer.Add(self.close_btn)
  1953 +
1944 1954 # Sizer
1945 1955 sizer = wx.BoxSizer(wx.VERTICAL)
1946 1956  
  1957 +
1947 1958 sizer.AddSpacer(5)
1948 1959 sizer.Add(wx.StaticText(self, -1, _(u"Parameters")), flag=wx.LEFT, border=5)
1949 1960 sizer.AddSpacer(5)
... ... @@ -1953,15 +1964,21 @@ class FFillOptionsDialog(wx.Dialog):
1953 1964 sizer.AddSpacer(5)
1954 1965 sizer.Add(self.panel3dcon, flag=wx.LEFT|wx.RIGHT|wx.EXPAND, border=7)
1955 1966 sizer.AddSpacer(5)
  1967 + sizer.AddSizer(self.close_btn, 0, flag=wx.ALIGN_RIGHT|wx.RIGHT, border=7)
  1968 + sizer.AddSpacer(5)
1956 1969  
1957 1970  
1958 1971 self.SetSizer(sizer)
1959 1972 sizer.Fit(self)
1960 1973 self.Layout()
1961 1974  
  1975 + self.close_btn.Bind(wx.EVT_BUTTON, self.OnBtnClose)
1962 1976 self.Bind(wx.EVT_RADIOBUTTON, self.OnSetRadio)
1963 1977 self.Bind(wx.EVT_CLOSE, self.OnClose)
1964 1978  
  1979 + def OnBtnClose(self, evt):
  1980 + self.Close()
  1981 +
1965 1982 def OnSetRadio(self, evt):
1966 1983 # Target
1967 1984 if self.panel_target.target_2d.GetValue():
... ... @@ -1984,6 +2001,7 @@ class FFillOptionsDialog(wx.Dialog):
1984 2001 self.config.con_3d = 26
1985 2002  
1986 2003 def OnClose(self, evt):
  2004 + print "ONCLOSE"
1987 2005 if self.config.dlg_visible:
1988 2006 Publisher.sendMessage('Disable style', const.SLICE_STATE_MASK_FFILL)
1989 2007 evt.Skip()
... ...