Author: bugman Date: Tue Jan 26 12:02:11 2010 New Revision: 10361 URL: http://svn.gna.org/viewcvs/relax?rev=10361&view=rev Log: Removed almost all of the variables in add_relax_data_input() out of the class namespace. These now only exist temporarily in the method namespace, cleaning up the class namespace. 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=10361&r1=10360&r2=10361&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:02:11 2010 @@ -239,91 +239,91 @@ """ # Create the panel. - self.panel_4_copy_1 = wx.Panel(self.gui.modelfree, -1) - self.panel_4_copy = wx.Panel(self.gui.modelfree, -1) - self.panel_4 = wx.Panel(self.gui.modelfree, -1) + panel_4_copy_1 = wx.Panel(self.gui.modelfree, -1) + panel_4_copy = wx.Panel(self.gui.modelfree, -1) + panel_4 = wx.Panel(self.gui.modelfree, -1) # The 1st panel contents. - self.label_7 = wx.StaticText(self.panel_4, -1, "NMR freq 1:") - self.modelfreefreq1 = wx.TextCtrl(self.panel_4, -1, "") - self.label_8 = wx.StaticText(self.panel_4, -1, "NOE") - self.m_noe_1 = wx.TextCtrl(self.panel_4, -1, "") - self.model_noe_1 = wx.Button(self.panel_4, -1, "+") - self.label_8_copy = wx.StaticText(self.panel_4, -1, "R1") - self.m_r1_1 = wx.TextCtrl(self.panel_4, -1, "") - self.model_r1_1 = wx.Button(self.panel_4, -1, "+") - self.label_8_copy_copy = wx.StaticText(self.panel_4, -1, "R2") - self.m_r2_1 = wx.TextCtrl(self.panel_4, -1, "") - self.model_r2_1 = wx.Button(self.panel_4, -1, "+") + 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, "") + 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, "") + 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, "") + model_r2_1 = wx.Button(panel_4, -1, "+") # The 2nd panel contents. - self.label_7_copy = wx.StaticText(self.panel_4_copy, -1, "NMR freq 2:") - self.modelfreefreq2 = wx.TextCtrl(self.panel_4_copy, -1, "") - self.label_8_copy_1 = wx.StaticText(self.panel_4_copy, -1, "NOE") - self.m_noe_2 = wx.TextCtrl(self.panel_4_copy, -1, "") - self.model_noe_2 = wx.Button(self.panel_4_copy, -1, "+") - self.label_8_copy_copy_1 = wx.StaticText(self.panel_4_copy, -1, "R1") - self.m_r1_2 = wx.TextCtrl(self.panel_4_copy, -1, "") - self.model_r1_2 = wx.Button(self.panel_4_copy, -1, "+") - self.label_8_copy_copy_copy = wx.StaticText(self.panel_4_copy, -1, "R2") - self.m_r2_2 = wx.TextCtrl(self.panel_4_copy, -1, "") - self.model_r2_2 = wx.Button(self.panel_4_copy, -1, "+") + 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, "") + 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, "") + 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, "") + model_r2_2 = wx.Button(panel_4_copy, -1, "+") # The 3rd panel contents. - self.label_7_copy_copy = wx.StaticText(self.panel_4_copy_1, -1, "NMR freq 3:") - self.modelfreefreq3 = wx.TextCtrl(self.panel_4_copy_1, -1, "") - self.label_8_copy_1_copy = wx.StaticText(self.panel_4_copy_1, -1, "NOE") - self.m_noe_3 = wx.TextCtrl(self.panel_4_copy_1, -1, "") - self.model_noe_3 = wx.Button(self.panel_4_copy_1, -1, "+") - self.label_8_copy_copy_1_copy = wx.StaticText(self.panel_4_copy_1, -1, "R1") - self.m_r1_3 = wx.TextCtrl(self.panel_4_copy_1, -1, "") - self.model_r1_3 = wx.Button(self.panel_4_copy_1, -1, "+") - self.label_8_copy_copy_copy_copy = wx.StaticText(self.panel_4_copy_1, -1, "R2") - self.m_r2_3 = wx.TextCtrl(self.panel_4_copy_1, -1, "") - self.model_r2_3 = wx.Button(self.panel_4_copy_1, -1, "+") + 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, "") + 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, "") + 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, "") + model_r2_3 = wx.Button(panel_4_copy_1, -1, "+") # Properties. - self.modelfreefreq1.SetMinSize((80, 20)) - self.label_8.SetMinSize((80, 17)) - self.m_noe_1.SetMinSize((120, 20)) - self.model_noe_1.SetMinSize((20, 20)) - self.model_noe_1.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.label_8_copy.SetMinSize((80, 17)) - self.m_r1_1.SetMinSize((120, 20)) - self.model_r1_1.SetMinSize((20, 20)) - self.model_r1_1.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.label_8_copy_copy.SetMinSize((80, 17)) - self.m_r2_1.SetMinSize((120, 20)) - self.model_r2_1.SetMinSize((20, 20)) - self.model_r2_1.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.label_7_copy.SetMinSize((80, 17)) - self.modelfreefreq2.SetMinSize((80, 20)) - self.label_8_copy_1.SetMinSize((80, 17)) - self.m_noe_2.SetMinSize((120, 20)) - self.model_noe_2.SetMinSize((20, 20)) - self.model_noe_2.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.label_8_copy_copy_1.SetMinSize((80, 17)) - self.m_r1_2.SetMinSize((120, 20)) - self.model_r1_2.SetMinSize((20, 20)) - self.model_r1_2.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.label_8_copy_copy_copy.SetMinSize((80, 17)) - self.m_r2_2.SetMinSize((120, 20)) - self.model_r2_2.SetMinSize((20, 20)) - self.model_r2_2.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.label_7_copy_copy.SetMinSize((80, 17)) - self.modelfreefreq3.SetMinSize((80, 20)) - self.label_8_copy_1_copy.SetMinSize((80, 17)) - self.m_noe_3.SetMinSize((120, 20)) - self.model_noe_3.SetMinSize((20, 20)) - self.model_noe_3.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.label_8_copy_copy_1_copy.SetMinSize((80, 17)) - self.m_r1_3.SetMinSize((120, 20)) - self.model_r1_3.SetMinSize((20, 20)) - self.model_r1_3.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.label_8_copy_copy_copy_copy.SetMinSize((80, 17)) - self.m_r2_3.SetMinSize((120, 20)) - self.model_r2_3.SetMinSize((20, 20)) - self.model_r2_3.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + modelfreefreq1.SetMinSize((80, 20)) + label_8.SetMinSize((80, 17)) + 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)) + 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)) + 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)) + 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)) + 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)) + 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)) + 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)) + 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)) + model_r2_3.SetMinSize((20, 20)) + model_r2_3.SetFont(wx.Font(6, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) # The box layout. sizer_16 = wx.BoxSizer(wx.HORIZONTAL) @@ -342,65 +342,65 @@ sizer_18_copy = wx.BoxSizer(wx.HORIZONTAL) sizer_19_copy_copy = wx.BoxSizer(wx.HORIZONTAL) sizer_19_copy = wx.BoxSizer(wx.HORIZONTAL) - self.panel_4_copy_1.SetSizer(sizer_17_copy_copy) + panel_4_copy_1.SetSizer(sizer_17_copy_copy) # Setup and pack the elements. - self.panel_4.SetMinSize((230, 85)) - self.panel_4.SetBackgroundColour(wx.Colour(192, 192, 192)) - self.panel_4_copy.SetMinSize((230, 85)) - self.panel_4_copy.SetBackgroundColour(wx.Colour(176, 176, 176)) - self.panel_4_copy_1.SetMinSize((230, 85)) - self.panel_4_copy_1.SetBackgroundColour(wx.Colour(192, 192, 192)) - sizer_18.Add(self.label_7, 0, wx.ADJUST_MINSIZE, 0) - sizer_18.Add(self.modelfreefreq1, 0, wx.ADJUST_MINSIZE, 0) + panel_4.SetMinSize((230, 85)) + panel_4.SetBackgroundColour(wx.Colour(192, 192, 192)) + panel_4_copy.SetMinSize((230, 85)) + panel_4_copy.SetBackgroundColour(wx.Colour(176, 176, 176)) + panel_4_copy_1.SetMinSize((230, 85)) + panel_4_copy_1.SetBackgroundColour(wx.Colour(192, 192, 192)) + sizer_18.Add(label_7, 0, wx.ADJUST_MINSIZE, 0) + sizer_18.Add(modelfreefreq1, 0, wx.ADJUST_MINSIZE, 0) sizer_17.Add(sizer_18, 0, 0, 0) - sizer_19.Add(self.label_8, 0, wx.ADJUST_MINSIZE, 0) - sizer_19.Add(self.m_noe_1, 0, wx.ADJUST_MINSIZE, 0) - sizer_19.Add(self.model_noe_1, 0, wx.ADJUST_MINSIZE, 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(model_noe_1, 0, wx.ADJUST_MINSIZE, 0) sizer_17.Add(sizer_19, 0, wx.EXPAND|wx.SHAPED, 0) - sizer_19_copy.Add(self.label_8_copy, 0, wx.ADJUST_MINSIZE, 0) - sizer_19_copy.Add(self.m_r1_1, 0, wx.ADJUST_MINSIZE, 0) - sizer_19_copy.Add(self.model_r1_1, 0, wx.ADJUST_MINSIZE, 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(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(self.label_8_copy_copy, 0, wx.ADJUST_MINSIZE, 0) - sizer_19_copy_copy.Add(self.m_r2_1, 0, wx.ADJUST_MINSIZE, 0) - sizer_19_copy_copy.Add(self.model_r2_1, 0, wx.ADJUST_MINSIZE, 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(model_r2_1, 0, wx.ADJUST_MINSIZE, 0) sizer_17.Add(sizer_19_copy_copy, 0, wx.EXPAND|wx.SHAPED, 0) - self.panel_4.SetSizer(sizer_17) - sizer_16.Add(self.panel_4, 0, 0, 0) - sizer_18_copy.Add(self.label_7_copy, 0, wx.ADJUST_MINSIZE, 0) - sizer_18_copy.Add(self.modelfreefreq2, 0, wx.ADJUST_MINSIZE, 0) + panel_4.SetSizer(sizer_17) + sizer_16.Add(panel_4, 0, 0, 0) + sizer_18_copy.Add(label_7_copy, 0, wx.ADJUST_MINSIZE, 0) + 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(self.label_8_copy_1, 0, wx.ADJUST_MINSIZE, 0) - sizer_19_copy_1.Add(self.m_noe_2, 0, wx.ADJUST_MINSIZE, 0) - sizer_19_copy_1.Add(self.model_noe_2, 0, wx.ADJUST_MINSIZE, 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(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(self.label_8_copy_copy_1, 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(self.model_r1_2, 0, wx.ADJUST_MINSIZE, 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(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(self.label_8_copy_copy_copy, 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(self.model_r2_2, 0, wx.ADJUST_MINSIZE, 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(model_r2_2, 0, wx.ADJUST_MINSIZE, 0) sizer_17_copy.Add(sizer_19_copy_copy_copy, 0, wx.EXPAND|wx.SHAPED, 0) - self.panel_4_copy.SetSizer(sizer_17_copy) - sizer_16.Add(self.panel_4_copy, 0, 0, 0) - sizer_18_copy_copy.Add(self.label_7_copy_copy, 0, wx.ADJUST_MINSIZE, 0) - sizer_18_copy_copy.Add(self.modelfreefreq3, 0, wx.ADJUST_MINSIZE, 0) + panel_4_copy.SetSizer(sizer_17_copy) + sizer_16.Add(panel_4_copy, 0, 0, 0) + sizer_18_copy_copy.Add(label_7_copy_copy, 0, wx.ADJUST_MINSIZE, 0) + 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(self.label_8_copy_1_copy, 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(self.model_noe_3, 0, wx.ADJUST_MINSIZE, 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(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(self.label_8_copy_copy_1_copy, 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(self.model_r1_3, 0, wx.ADJUST_MINSIZE, 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(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(self.label_8_copy_copy_copy_copy, 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(self.model_r2_3, 0, wx.ADJUST_MINSIZE, 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(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(self.panel_4_copy_1, 0, 0, 0) + sizer_16.Add(panel_4_copy_1, 0, 0, 0) box.Add(sizer_16, 0, 0, 0)