Author: bugman
Date: Tue Jan 26 12:13:20 2010
New Revision: 10363
URL: http://svn.gna.org/viewcvs/relax?rev=10363&view=rev
Log:
Shifted a few variable of add_relax_data_input() back into the class
namespace.
This allows the methods bound to the buttons to function.
Modified:
branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_model_free.py?rev=10363&r1=10362&r2=10363&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Tue Jan 26
12:13:20 2010
@@ -238,81 +238,81 @@
label_7 = wx.StaticText(panel_4, -1, "NMR freq 1:")
modelfreefreq1 = wx.TextCtrl(panel_4, -1, "")
label_8 = wx.StaticText(panel_4, -1, "NOE")
- m_noe_1 = wx.TextCtrl(panel_4, -1, "")
+ self.m_noe_1 = wx.TextCtrl(panel_4, -1, "")
model_noe_1 = wx.Button(panel_4, -1, "+")
label_8_copy = wx.StaticText(panel_4, -1, "R1")
- m_r1_1 = wx.TextCtrl(panel_4, -1, "")
+ self.m_r1_1 = wx.TextCtrl(panel_4, -1, "")
model_r1_1 = wx.Button(panel_4, -1, "+")
label_8_copy_copy = wx.StaticText(panel_4, -1, "R2")
- m_r2_1 = wx.TextCtrl(panel_4, -1, "")
+ self.m_r2_1 = wx.TextCtrl(panel_4, -1, "")
model_r2_1 = wx.Button(panel_4, -1, "+")
# The 2nd panel contents.
label_7_copy = wx.StaticText(panel_4_copy, -1, "NMR freq 2:")
modelfreefreq2 = wx.TextCtrl(panel_4_copy, -1, "")
label_8_copy_1 = wx.StaticText(panel_4_copy, -1, "NOE")
- m_noe_2 = wx.TextCtrl(panel_4_copy, -1, "")
+ self.m_noe_2 = wx.TextCtrl(panel_4_copy, -1, "")
model_noe_2 = wx.Button(panel_4_copy, -1, "+")
label_8_copy_copy_1 = wx.StaticText(panel_4_copy, -1, "R1")
- m_r1_2 = wx.TextCtrl(panel_4_copy, -1, "")
+ self.m_r1_2 = wx.TextCtrl(panel_4_copy, -1, "")
model_r1_2 = wx.Button(panel_4_copy, -1, "+")
label_8_copy_copy_copy = wx.StaticText(panel_4_copy, -1, "R2")
- m_r2_2 = wx.TextCtrl(panel_4_copy, -1, "")
+ self.m_r2_2 = wx.TextCtrl(panel_4_copy, -1, "")
model_r2_2 = wx.Button(panel_4_copy, -1, "+")
# The 3rd panel contents.
label_7_copy_copy = wx.StaticText(panel_4_copy_1, -1, "NMR freq 3:")
modelfreefreq3 = wx.TextCtrl(panel_4_copy_1, -1, "")
label_8_copy_1_copy = wx.StaticText(panel_4_copy_1, -1, "NOE")
- m_noe_3 = wx.TextCtrl(panel_4_copy_1, -1, "")
+ self.m_noe_3 = wx.TextCtrl(panel_4_copy_1, -1, "")
model_noe_3 = wx.Button(panel_4_copy_1, -1, "+")
label_8_copy_copy_1_copy = wx.StaticText(panel_4_copy_1, -1, "R1")
- m_r1_3 = wx.TextCtrl(panel_4_copy_1, -1, "")
+ self.m_r1_3 = wx.TextCtrl(panel_4_copy_1, -1, "")
model_r1_3 = wx.Button(panel_4_copy_1, -1, "+")
label_8_copy_copy_copy_copy = wx.StaticText(panel_4_copy_1, -1, "R2")
- m_r2_3 = wx.TextCtrl(panel_4_copy_1, -1, "")
+ self.m_r2_3 = wx.TextCtrl(panel_4_copy_1, -1, "")
model_r2_3 = wx.Button(panel_4_copy_1, -1, "+")
# Properties.
modelfreefreq1.SetMinSize((80, 20))
label_8.SetMinSize((80, 17))
- m_noe_1.SetMinSize((120, 20))
+ self.m_noe_1.SetMinSize((120, 20))
model_noe_1.SetMinSize((20, 20))
model_noe_1.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
label_8_copy.SetMinSize((80, 17))
- m_r1_1.SetMinSize((120, 20))
+ self.m_r1_1.SetMinSize((120, 20))
model_r1_1.SetMinSize((20, 20))
model_r1_1.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
label_8_copy_copy.SetMinSize((80, 17))
- m_r2_1.SetMinSize((120, 20))
+ self.m_r2_1.SetMinSize((120, 20))
model_r2_1.SetMinSize((20, 20))
model_r2_1.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
label_7_copy.SetMinSize((80, 17))
modelfreefreq2.SetMinSize((80, 20))
label_8_copy_1.SetMinSize((80, 17))
- m_noe_2.SetMinSize((120, 20))
+ self.m_noe_2.SetMinSize((120, 20))
model_noe_2.SetMinSize((20, 20))
model_noe_2.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
label_8_copy_copy_1.SetMinSize((80, 17))
- m_r1_2.SetMinSize((120, 20))
+ self.m_r1_2.SetMinSize((120, 20))
model_r1_2.SetMinSize((20, 20))
model_r1_2.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
label_8_copy_copy_copy.SetMinSize((80, 17))
- m_r2_2.SetMinSize((120, 20))
+ self.m_r2_2.SetMinSize((120, 20))
model_r2_2.SetMinSize((20, 20))
model_r2_2.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
label_7_copy_copy.SetMinSize((80, 17))
modelfreefreq3.SetMinSize((80, 20))
label_8_copy_1_copy.SetMinSize((80, 17))
- m_noe_3.SetMinSize((120, 20))
+ self.m_noe_3.SetMinSize((120, 20))
model_noe_3.SetMinSize((20, 20))
model_noe_3.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
label_8_copy_copy_1_copy.SetMinSize((80, 17))
- m_r1_3.SetMinSize((120, 20))
+ self.m_r1_3.SetMinSize((120, 20))
model_r1_3.SetMinSize((20, 20))
model_r1_3.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
label_8_copy_copy_copy_copy.SetMinSize((80, 17))
- m_r2_3.SetMinSize((120, 20))
+ self.m_r2_3.SetMinSize((120, 20))
model_r2_3.SetMinSize((20, 20))
model_r2_3.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0,
""))
@@ -346,15 +346,15 @@
sizer_18.Add(modelfreefreq1, 0, wx.ADJUST_MINSIZE, 0)
sizer_17.Add(sizer_18, 0, 0, 0)
sizer_19.Add(label_8, 0, wx.ADJUST_MINSIZE, 0)
- sizer_19.Add(m_noe_1, 0, wx.ADJUST_MINSIZE, 0)
+ sizer_19.Add(self.m_noe_1, 0, wx.ADJUST_MINSIZE, 0)
sizer_19.Add(model_noe_1, 0, wx.ADJUST_MINSIZE, 0)
sizer_17.Add(sizer_19, 0, wx.EXPAND|wx.SHAPED, 0)
sizer_19_copy.Add(label_8_copy, 0, wx.ADJUST_MINSIZE, 0)
- sizer_19_copy.Add(m_r1_1, 0, wx.ADJUST_MINSIZE, 0)
+ sizer_19_copy.Add(self.m_r1_1, 0, wx.ADJUST_MINSIZE, 0)
sizer_19_copy.Add(model_r1_1, 0, wx.ADJUST_MINSIZE, 0)
sizer_17.Add(sizer_19_copy, 0, wx.EXPAND|wx.SHAPED, 0)
sizer_19_copy_copy.Add(label_8_copy_copy, 0, wx.ADJUST_MINSIZE, 0)
- sizer_19_copy_copy.Add(m_r2_1, 0, wx.ADJUST_MINSIZE, 0)
+ sizer_19_copy_copy.Add(self.m_r2_1, 0, wx.ADJUST_MINSIZE, 0)
sizer_19_copy_copy.Add(model_r2_1, 0, wx.ADJUST_MINSIZE, 0)
sizer_17.Add(sizer_19_copy_copy, 0, wx.EXPAND|wx.SHAPED, 0)
panel_4.SetSizer(sizer_17)
@@ -363,15 +363,15 @@
sizer_18_copy.Add(modelfreefreq2, 0, wx.ADJUST_MINSIZE, 0)
sizer_17_copy.Add(sizer_18_copy, 0, 0, 0)
sizer_19_copy_1.Add(label_8_copy_1, 0, wx.ADJUST_MINSIZE, 0)
- sizer_19_copy_1.Add(m_noe_2, 0, wx.ADJUST_MINSIZE, 0)
+ sizer_19_copy_1.Add(self.m_noe_2, 0, wx.ADJUST_MINSIZE, 0)
sizer_19_copy_1.Add(model_noe_2, 0, wx.ADJUST_MINSIZE, 0)
sizer_17_copy.Add(sizer_19_copy_1, 0, wx.EXPAND|wx.SHAPED, 0)
sizer_19_copy_copy_1.Add(label_8_copy_copy_1, 0, wx.ADJUST_MINSIZE,
0)
- sizer_19_copy_copy_1.Add(m_r1_2, 0, wx.ADJUST_MINSIZE, 0)
+ sizer_19_copy_copy_1.Add(self.m_r1_2, 0, wx.ADJUST_MINSIZE, 0)
sizer_19_copy_copy_1.Add(model_r1_2, 0, wx.ADJUST_MINSIZE, 0)
sizer_17_copy.Add(sizer_19_copy_copy_1, 0, wx.EXPAND|wx.SHAPED, 0)
sizer_19_copy_copy_copy.Add(label_8_copy_copy_copy, 0,
wx.ADJUST_MINSIZE, 0)
- sizer_19_copy_copy_copy.Add(m_r2_2, 0, wx.ADJUST_MINSIZE, 0)
+ sizer_19_copy_copy_copy.Add(self.m_r2_2, 0, wx.ADJUST_MINSIZE, 0)
sizer_19_copy_copy_copy.Add(model_r2_2, 0, wx.ADJUST_MINSIZE, 0)
sizer_17_copy.Add(sizer_19_copy_copy_copy, 0, wx.EXPAND|wx.SHAPED, 0)
panel_4_copy.SetSizer(sizer_17_copy)
@@ -380,15 +380,15 @@
sizer_18_copy_copy.Add(modelfreefreq3, 0, wx.ADJUST_MINSIZE, 0)
sizer_17_copy_copy.Add(sizer_18_copy_copy, 0, 0, 0)
sizer_19_copy_1_copy.Add(label_8_copy_1_copy, 0, wx.ADJUST_MINSIZE,
0)
- sizer_19_copy_1_copy.Add(m_noe_3, 0, wx.ADJUST_MINSIZE, 0)
+ sizer_19_copy_1_copy.Add(self.m_noe_3, 0, wx.ADJUST_MINSIZE, 0)
sizer_19_copy_1_copy.Add(model_noe_3, 0, wx.ADJUST_MINSIZE, 0)
sizer_17_copy_copy.Add(sizer_19_copy_1_copy, 0, wx.EXPAND|wx.SHAPED,
0)
sizer_19_copy_copy_1_copy.Add(label_8_copy_copy_1_copy, 0,
wx.ADJUST_MINSIZE, 0)
- sizer_19_copy_copy_1_copy.Add(m_r1_3, 0, wx.ADJUST_MINSIZE, 0)
+ sizer_19_copy_copy_1_copy.Add(self.m_r1_3, 0, wx.ADJUST_MINSIZE, 0)
sizer_19_copy_copy_1_copy.Add(model_r1_3, 0, wx.ADJUST_MINSIZE, 0)
sizer_17_copy_copy.Add(sizer_19_copy_copy_1_copy, 0,
wx.EXPAND|wx.SHAPED, 0)
sizer_19_copy_copy_copy_copy.Add(label_8_copy_copy_copy_copy, 0,
wx.ADJUST_MINSIZE, 0)
- sizer_19_copy_copy_copy_copy.Add(m_r2_3, 0, wx.ADJUST_MINSIZE, 0)
+ sizer_19_copy_copy_copy_copy.Add(self.m_r2_3, 0, wx.ADJUST_MINSIZE,
0)
sizer_19_copy_copy_copy_copy.Add(model_r2_3, 0, wx.ADJUST_MINSIZE, 0)
sizer_17_copy_copy.Add(sizer_19_copy_copy_copy_copy, 0,
wx.EXPAND|wx.SHAPED, 0)
sizer_16.Add(panel_4_copy_1, 0, 0, 0)
r10363 - /branches/bieri_gui/gui_bieri/analyses/auto_model_free.py