Author: bugman
Date: Thu Jan 28 19:07:17 2010
New Revision: 10546
URL: http://svn.gna.org/viewcvs/relax?rev=10546&view=rev
Log:
A debugging return statement was removed and all self.r1_1 was replaced by
self.parent.
Modified:
branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py
Modified: branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py?rev=10546&r1=10545&r2=10546&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py Thu Jan 28 19:07:17
2010
@@ -74,22 +74,21 @@
def build_main_box(self):
- return
# R1 no. 1
- self.bitmap_1_copy_copy = wx.StaticBitmap(self.r1_1, -1,
wx.Bitmap(IMAGE_PATH+'r1.png', wx.BITMAP_TYPE_ANY))
- self.label_4_copy_copy = wx.StaticText(self.r1_1, -1, "Set-up for R1
relaxation analysis:")
- self.label_2_copy_copy_copy_2_copy = wx.StaticText(self.r1_1, -1,
"NMR Frequency [MHz]:", style=wx.ALIGN_RIGHT)
- self.nmrfreq_value_r11 = wx.TextCtrl(self.r1_1, -1,
str(self.data.frq))
- self.label_2_copy_copy_3_copy_copy = wx.StaticText(self.r1_1, -1,
"Results directory", style=wx.ALIGN_RIGHT)
- self.resultsdir_r11 = wx.TextCtrl(self.r1_1, -1, self.data.save_dir)
- self.results_directory_copy_copy = wx.Button(self.r1_1, -1, "Change")
- self.structure_file = wx.StaticText(self.r1_1, -1, "Structure file
(.pdb)", style=wx.ALIGN_RIGHT)
- self.structure_r11 = StructureTextCtrl(self.r1_1, -1,
self.structure_file_pdb_msg)
+ self.bitmap_1_copy_copy = wx.StaticBitmap(self.parent, -1,
wx.Bitmap(IMAGE_PATH+'r1.png', wx.BITMAP_TYPE_ANY))
+ self.label_4_copy_copy = wx.StaticText(self.parent, -1, "Set-up for
R1 relaxation analysis:")
+ self.label_2_copy_copy_copy_2_copy = wx.StaticText(self.parent, -1,
"NMR Frequency [MHz]:", style=wx.ALIGN_RIGHT)
+ self.nmrfreq_value_r11 = wx.TextCtrl(self.parent, -1,
str(self.data.frq))
+ self.label_2_copy_copy_3_copy_copy = wx.StaticText(self.parent, -1,
"Results directory", style=wx.ALIGN_RIGHT)
+ self.resultsdir_r11 = wx.TextCtrl(self.parent, -1,
self.data.save_dir)
+ self.results_directory_copy_copy = wx.Button(self.parent, -1,
"Change")
+ self.structure_file = wx.StaticText(self.parent, -1, "Structure file
(.pdb)", style=wx.ALIGN_RIGHT)
+ self.structure_r11 = StructureTextCtrl(self.parent, -1,
self.structure_file_pdb_msg)
self.structure_r11.SetEditable(False)
- self.results_directory_copy_copy_copy = wx.Button(self.r1_1, -1,
"Change")
- self.label_2_copy_copy_copy_2_copy_copy = wx.StaticText(self.r1_1,
-1, "Unresolved residues:", style=wx.ALIGN_RIGHT)
- self.unresolved_r11 = wx.TextCtrl(self.r1_1, -1, "")
- self.panel_2 = wx.Panel(self.r1_1, -1)
+ self.results_directory_copy_copy_copy = wx.Button(self.parent, -1,
"Change")
+ self.label_2_copy_copy_copy_2_copy_copy = wx.StaticText(self.parent,
-1, "Unresolved residues:", style=wx.ALIGN_RIGHT)
+ self.unresolved_r11 = wx.TextCtrl(self.parent, -1, "")
+ self.panel_2 = wx.Panel(self.parent, -1)
self.addr11 = wx.Button(self.panel_1, -1, "add")
self.refreshr11 = wx.Button(self.panel_1, -1, "refresh")
self.label_3 = wx.StaticText(self.panel_3, -1, "R1 relaxation peak
list ")
@@ -122,8 +121,8 @@
self.r1_time_13 = wx.TextCtrl(self.panel_3, -1, "")
self.r1_list_14 = wx.StaticText(self.panel_3, -1, "")
self.r1_time_1_4 = wx.TextCtrl(self.panel_3, -1, "")
- self.label_5_copy_1_copy = wx.StaticText(self.r1_1, -1, "Execute
relax ", style=wx.ALIGN_RIGHT)
- self.relax_start_r1_1 = wx.BitmapButton(self.r1_1, -1,
wx.Bitmap(IMAGE_PATH+'relax_start.gif', wx.BITMAP_TYPE_ANY))
+ self.label_5_copy_1_copy = wx.StaticText(self.parent, -1, "Execute
relax ", style=wx.ALIGN_RIGHT)
+ self.relax_start_r1_1 = wx.BitmapButton(self.parent, -1,
wx.Bitmap(IMAGE_PATH+'relax_start.gif', wx.BITMAP_TYPE_ANY))
#button actions
self.Bind(wx.EVT_BUTTON, self.resdir_r1_1,
self.results_directory_copy_copy)
@@ -348,7 +347,7 @@
exec_relax_copy_1_copy.Add(self.relax_start_r1_1, 0,
wx.RIGHT|wx.ADJUST_MINSIZE, 0)
sizer_11.Add(exec_relax_copy_1_copy, 0, wx.ALIGN_RIGHT, 0)
sizer_10.Add(sizer_11, 0, 0, 0)
- self.r1_1.SetSizer(sizer_10)
+ self.parent.SetSizer(sizer_10)
sizer_10_copy.Add(self.bitmap_1_copy_copy_copy, 0,
wx.ADJUST_MINSIZE, 10)
sizer_11_copy.Add(self.label_4_copy_copy_copy, 0,
wx.BOTTOM|wx.ADJUST_MINSIZE, 18)
nmr_freq_copy_copy_copy_1.Add(self.label_2_copy_copy_copy_2_copy_copy_1, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
@@ -409,7 +408,7 @@
sizer_10_copy.Add(sizer_11_copy, 0, 0, 0)
self.r2_1.SetSizer(sizer_10_copy)
self.notebook_3.AddPage(self.noe1, "steady-state NOE")
- self.notebook_3.AddPage(self.r1_1, "R1 relaxation")
+ self.notebook_3.AddPage(self.parent, "R1 relaxation")
self.notebook_3.AddPage(self.r2_1, "R2 relaxation")
frq1sub.Add(self.notebook_3, 1, wx.EXPAND, 0)
self.frq1.SetSizer(frq1sub)
@@ -729,7 +728,7 @@
sizer_10_copy_copy_1.Add(sizer_11_copy_copy_1, 0, 0, 0)
self.r2_1_copy_1.SetSizer(sizer_10_copy_copy_1)
self.notebook_3_copy_1.AddPage(self.noe1_copy_1, "steady-state NOE")
- self.notebook_3_copy_1.AddPage(self.r1_1_copy_1, "R1 relaxation")
+ self.notebook_3_copy_1.AddPage(self.parent_copy_1, "R1 relaxation")
self.notebook_3_copy_1.AddPage(self.r2_1_copy_1, "R2 relaxation")
frq1sub_copy_1.Add(self.notebook_3_copy_1, 1, wx.EXPAND, 0)
self.frq3.SetSizer(frq1sub_copy_1)
r10546 - /branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py