Download as
Browse Code »

Commit dce732c0a9d4f67bd06a190455f0e8922ad40bb2

Authored by Thiago Franco de Moraes
1 parent b76426df
Exists in ffill_gui

Enabling and disabling 3D or 2D conn panel according to target selected

Showing 1 changed file with 10 additions and 8 deletions   Show diff stats
invesalius/gui/dialogs.py
  Diff comments   View file @dce732c
@@ -1922,15 +1922,19 @@ class FFillOptionsDialog(wx.Dialog): @@ -1922,15 +1922,19 @@ class FFillOptionsDialog(wx.Dialog):
1922 """ 1922 """
1923 # Target 1923 # Target
1924 self.panel_target = PanelTargeFFill(self, style=wx.SUNKEN_BORDER) 1924 self.panel_target = PanelTargeFFill(self, style=wx.SUNKEN_BORDER)
  1925 + self.panel2dcon = Panel2DConnectivity(self, style=wx.SUNKEN_BORDER)
  1926 + self.panel3dcon = Panel3DConnectivity(self, style=wx.SUNKEN_BORDER)
1925 1927
1926 if self.config.target == "2D": 1928 if self.config.target == "2D":
1927 self.panel_target.target_2d.SetValue(1) 1929 self.panel_target.target_2d.SetValue(1)
  1930 + self.panel2dcon.Enable(1)
  1931 + self.panel3dcon.Enable(0)
1928 else: 1932 else:
1929 self.panel_target.target_3d.SetValue(1) 1933 self.panel_target.target_3d.SetValue(1)
  1934 + self.panel3dcon.Enable(1)
  1935 + self.panel2dcon.Enable(0)
1930 1936
1931 # Connectivity 2D 1937 # Connectivity 2D
1932 - self.panel2dcon = Panel2DConnectivity(self, style=wx.SUNKEN_BORDER)  
1933 -  
1934 if self.config.con_2d == 8: 1938 if self.config.con_2d == 8:
1935 self.panel2dcon.conect2D_8.SetValue(1) 1939 self.panel2dcon.conect2D_8.SetValue(1)
1936 else: 1940 else:
@@ -1938,8 +1942,6 @@ class FFillOptionsDialog(wx.Dialog): @@ -1938,8 +1942,6 @@ class FFillOptionsDialog(wx.Dialog):
1938 self.config.con_2d = 4 1942 self.config.con_2d = 4
1939 1943
1940 # Connectivity 3D 1944 # Connectivity 3D
1941 - self.panel3dcon = Panel3DConnectivity(self, style=wx.SUNKEN_BORDER)  
1942 -  
1943 if self.config.con_3d == 18: 1945 if self.config.con_3d == 18:
1944 self.panel3dcon.conect3D_18.SetValue(1) 1946 self.panel3dcon.conect3D_18.SetValue(1)
1945 elif self.config.con_3d == 26: 1947 elif self.config.con_3d == 26:
@@ -1948,13 +1950,10 @@ class FFillOptionsDialog(wx.Dialog): @@ -1948,13 +1950,10 @@ class FFillOptionsDialog(wx.Dialog):
1948 self.panel3dcon.conect3D_6.SetValue(1) 1950 self.panel3dcon.conect3D_6.SetValue(1)
1949 1951
1950 self.close_btn = wx.Button(self, wx.ID_CLOSE) 1952 self.close_btn = wx.Button(self, wx.ID_CLOSE)
1951 - # btn_sizer = self.CreateStdDialogButtonSizer(wx.CLOSE)  
1952 - # btn_sizer.Add(self.close_btn)  
1953 1953
1954 # Sizer 1954 # Sizer
1955 sizer = wx.BoxSizer(wx.VERTICAL) 1955 sizer = wx.BoxSizer(wx.VERTICAL)
1956 1956
1957 -  
1958 sizer.AddSpacer(5) 1957 sizer.AddSpacer(5)
1959 sizer.Add(wx.StaticText(self, -1, _(u"Parameters")), flag=wx.LEFT, border=5) 1958 sizer.Add(wx.StaticText(self, -1, _(u"Parameters")), flag=wx.LEFT, border=5)
1960 sizer.AddSpacer(5) 1959 sizer.AddSpacer(5)
@@ -1967,7 +1966,6 @@ class FFillOptionsDialog(wx.Dialog): @@ -1967,7 +1966,6 @@ class FFillOptionsDialog(wx.Dialog):
1967 sizer.AddSizer(self.close_btn, 0, flag=wx.ALIGN_RIGHT|wx.RIGHT, border=7) 1966 sizer.AddSizer(self.close_btn, 0, flag=wx.ALIGN_RIGHT|wx.RIGHT, border=7)
1968 sizer.AddSpacer(5) 1967 sizer.AddSpacer(5)
1969 1968
1970 -  
1971 self.SetSizer(sizer) 1969 self.SetSizer(sizer)
1972 sizer.Fit(self) 1970 sizer.Fit(self)
1973 self.Layout() 1971 self.Layout()
@@ -1983,8 +1981,12 @@ class FFillOptionsDialog(wx.Dialog): @@ -1983,8 +1981,12 @@ class FFillOptionsDialog(wx.Dialog):
1983 # Target 1981 # Target
1984 if self.panel_target.target_2d.GetValue(): 1982 if self.panel_target.target_2d.GetValue():
1985 self.config.target = "2D" 1983 self.config.target = "2D"
  1984 + self.panel2dcon.Enable(1)
  1985 + self.panel3dcon.Enable(0)
1986 else: 1986 else:
1987 self.config.target = "3D" 1987 self.config.target = "3D"
  1988 + self.panel3dcon.Enable(1)
  1989 + self.panel2dcon.Enable(0)
1988 1990
1989 # 2D 1991 # 2D
1990 if self.panel2dcon.conect2D_4.GetValue(): 1992 if self.panel2dcon.conect2D_4.GetValue():