Author: bugman
Date: Thu Jan 28 19:05:17 2010
New Revision: 10545
URL: http://svn.gna.org/viewcvs/relax?rev=10545&view=rev
Log:
Deleted most of the code of the 1st R1 frame from the main GUI class.
Modified:
branches/bieri_gui/gui_bieri/relax_gui.py
Modified: branches/bieri_gui/gui_bieri/relax_gui.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/relax_gui.py?rev=10545&r1=10544&r2=10545&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Thu Jan 28 19:05:17 2010
@@ -486,16 +486,10 @@
self.Bind(wx.EVT_BUTTON, self.structure_noe1.open_file,
self.ref_noe_copy_1)
self.Bind(wx.EVT_BUTTON, self.resdir_noe1, self.chandir_noe1)
self.Bind(wx.EVT_BUTTON, self.exec_noe1, self.relax_start_noe1)
- self.Bind(wx.EVT_BUTTON, self.resdir_r1_1,
self.results_directory_copy_copy)
- self.Bind(wx.EVT_BUTTON, self.structure_r11.open_file,
self.results_directory_copy_copy_copy)
- self.Bind(wx.EVT_BUTTON, self.add_r1_1, self.addr11)
- self.Bind(wx.EVT_BUTTON, self.refresh_r1_1, self.refreshr11)
- self.Bind(wx.EVT_BUTTON, self.exec_r2_1, self.relax_start_r1_1)
self.Bind(wx.EVT_BUTTON, self.resdir_r2_1,
self.results_directory_r21)
self.Bind(wx.EVT_BUTTON, self.structure_r21.open_file,
self.chan_struc_r21)
self.Bind(wx.EVT_BUTTON, self.add_r2_1, self.addr21)
self.Bind(wx.EVT_BUTTON, self.refresh_r2_1, self.refreshr21)
- self.Bind(wx.EVT_BUTTON, self.exec_r1_1, self.relax_start_r1_1_copy)
self.Bind(wx.EVT_BUTTON, self.sat_noe2, self.sat_noe_copy_1_copy)
self.Bind(wx.EVT_BUTTON, self.ref_noe2, self.noe_ref_err_copy_1_copy)
self.Bind(wx.EVT_BUTTON, self.structure_noe1_copy.open_file,
self.ref_noe_copy_1_copy)
@@ -692,66 +686,12 @@
sizer_6_copy_1.Add(exec_relax_copy_1, 1, wx.ALIGN_RIGHT, 0)
sizer_5_copy_1.Add(sizer_6_copy_1, 1, wx.EXPAND|wx.SHAPED, 0)
self.noe1.SetSizer(sizer_5_copy_1)
- sizer_10.Add(self.bitmap_1_copy_copy, 0, wx.ADJUST_MINSIZE, 10)
- sizer_11.Add(self.label_4_copy_copy, 0, wx.BOTTOM|wx.ADJUST_MINSIZE,
18)
- nmr_freq_copy_copy.Add(self.label_2_copy_copy_copy_2_copy, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
- nmr_freq_copy_copy.Add(self.nmrfreq_value_r11, 0,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
- sizer_11.Add(nmr_freq_copy_copy, 0, wx.EXPAND|wx.SHAPED, 0)
- results_dir_copy_copy.Add(self.label_2_copy_copy_3_copy_copy, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
- results_dir_copy_copy.Add(self.resultsdir_r11, 0,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
- results_dir_copy_copy.Add(self.results_directory_copy_copy, 0,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 10)
- sizer_11.Add(results_dir_copy_copy, 1, wx.EXPAND, 0)
- results_dir_copy_copy_copy.Add(self.structure_file, 0,
wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
- results_dir_copy_copy_copy.Add(self.structure_r11, 0,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
-
results_dir_copy_copy_copy.Add(self.results_directory_copy_copy_copy, 0,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 10)
- sizer_11.Add(results_dir_copy_copy_copy, 1, wx.EXPAND, 0)
- nmr_freq_copy_copy_copy.Add(self.label_2_copy_copy_copy_2_copy_copy,
0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
- nmr_freq_copy_copy_copy.Add(self.unresolved_r11, 0,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
- sizer_11.Add(nmr_freq_copy_copy_copy, 0, wx.EXPAND|wx.SHAPED, 0)
- sizer_11.Add(self.panel_2, 0, wx.EXPAND|wx.SHAPED, 0)
- sizer_13.Add(self.addr11, 0, wx.ADJUST_MINSIZE, 0)
- sizer_13.Add(self.refreshr11, 0, wx.ADJUST_MINSIZE, 0)
- sizer_12.Add(sizer_13, 1, wx.EXPAND, 0)
- grid_sizer_1.Add(self.label_3, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.label_6, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_1, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_1, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_2, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_2, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_3, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_3, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_4, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_4, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_5, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_5, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_6, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_6, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_7, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_7, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_8, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_8, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_9, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_9, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_10, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_10, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_11, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_11, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_12, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_12, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_1_copy_11, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_13, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_list_14, 0, wx.ADJUST_MINSIZE, 0)
- grid_sizer_1.Add(self.r1_time_1_4, 0, wx.ADJUST_MINSIZE, 0)
self.panel_3.SetSizer(grid_sizer_1)
sizer_12.Add(self.panel_3, 0, wx.EXPAND|wx.SHAPED, 0)
self.panel_1.SetSizer(sizer_12)
sizer_11.Add(self.panel_1, 0, wx.EXPAND|wx.SHAPED, 0)
- exec_relax_copy_1_copy.Add(self.label_5_copy_1_copy, 0,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
- 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)
- 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)
nmr_freq_copy_copy_copy_1.Add(self.nmrfreq_value_r21, 0,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
@@ -811,7 +751,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.analysis_frames[self.hardcoded_index_r1_1].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)
@@ -1199,43 +1139,6 @@
self.label_5_copy_1.SetMinSize((118, 17))
self.relax_start_noe1.SetName('hello')
self.relax_start_noe1.SetSize(self.relax_start_noe1.GetBestSize())
- self.label_4_copy_copy.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL,
wx.NORMAL, 0, "Sans"))
- self.label_2_copy_copy_copy_2_copy.SetMinSize((230, 17))
- self.nmrfreq_value_r11.SetMinSize((350, 27))
- self.label_2_copy_copy_3_copy_copy.SetMinSize((230, 17))
- self.resultsdir_r11.SetMinSize((350, 27))
- self.results_directory_copy_copy.SetMinSize((103, 27))
- self.structure_file.SetMinSize((230, 17))
- self.structure_r11.SetMinSize((350, 27))
- self.results_directory_copy_copy_copy.SetMinSize((103, 27))
- self.label_2_copy_copy_copy_2_copy_copy.SetMinSize((230, 17))
- self.unresolved_r11.SetMinSize((350, 27))
- self.panel_2.SetMinSize((688, 5))
- self.addr11.SetMinSize((60, 27))
- self.refreshr11.SetMinSize((60, 27))
- self.label_3.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0,
""))
- self.label_6.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0,
""))
- self.r1_time_1.SetMinSize((80, 20))
- self.r1_time_2.SetMinSize((80, 20))
- self.r1_time_3.SetMinSize((80, 20))
- self.r1_time_4.SetMinSize((80, 20))
- self.r1_time_5.SetMinSize((80, 20))
- self.r1_time_6.SetMinSize((80, 20))
- self.r1_time_7.SetMinSize((80, 20))
- self.r1_time_8.SetMinSize((80, 20))
- self.r1_time_9.SetMinSize((80, 20))
- self.r1_time_10.SetMinSize((80, 20))
- self.r1_time_11.SetMinSize((80, 20))
- self.r1_time_12.SetMinSize((80, 20))
- self.r1_time_13.SetMinSize((80, 20))
- self.r1_time_1_4.SetMinSize((80, 20))
- self.panel_3.SetMinSize((620, 300))
- self.panel_3.SetBackgroundColour(wx.Colour(192, 192, 192))
- self.panel_1.SetMinSize((688, 300))
- self.panel_1.SetBackgroundColour(wx.Colour(192, 192, 192))
- self.label_5_copy_1_copy.SetMinSize((118, 17))
- self.relax_start_r1_1.SetName('hello')
- self.relax_start_r1_1.SetSize(self.relax_start_r1_1.GetBestSize())
self.label_4_copy_copy_copy.SetFont(wx.Font(16, wx.DEFAULT,
wx.NORMAL, wx.NORMAL, 0, "Sans"))
self.label_2_copy_copy_copy_2_copy_copy_1.SetMinSize((230, 17))
self.nmrfreq_value_r21.SetMinSize((350, 27))
@@ -1870,29 +1773,6 @@
event.Skip()
- def exec_r1_1(self, event): # start r2 calculation
- relax_times_r2_1 = [0,0,0,0,0,0,0,0,0,0,0,0,0,0]
- #create relaxation time list
- relax_times_r2_1[0] = str(self.r2_time_1.GetValue())
- relax_times_r2_1[1] = str(self.r2_time_2.GetValue())
- relax_times_r2_1[2] = str(self.r2_time_3.GetValue())
- relax_times_r2_1[3] = str(self.r2_time_4.GetValue())
- relax_times_r2_1[4] = str(self.r2_time_5.GetValue())
- relax_times_r2_1[5] = str(self.r2_time_6.GetValue())
- relax_times_r2_1[6] = str(self.r2_time_7.GetValue())
- relax_times_r2_1[7] = str(self.r2_time_8.GetValue())
- relax_times_r2_1[8] = str(self.r2_time_9.GetValue())
- relax_times_r2_1[9] = str(self.r2_time_10.GetValue())
- relax_times_r2_1[10] = str(self.r2_time_11.GetValue())
- relax_times_r2_1[11] = str(self.r2_time_12.GetValue())
- relax_times_r2_1[12] = str(self.r2_time_13.GetValue())
- relax_times_r2_1[13] = str(self.r2_time_14.GetValue())
- start_relax = exec_relax()
- if start_relax == True:
- start_rx(self.resultsdir_r21.GetValue(), r2_list,
relax_times_r2_1, self.structure_r11.GetValue(),
self.nmrfreq_value_r11.GetValue(), 2, 1, self.unresolved_r11.GetValue(),
self, 1, global_setting, file_setting, sequencefile)
- event.Skip()
-
-
def exec_r1_2(self, event): # execute r1 calculation no. 2
relax_times_r1_2 = [0,0,0,0,0,0,0,0,0,0,0,0,0,0]
#create relaxation time list
@@ -2397,16 +2277,6 @@
event.Skip()
- def resdir_r1_1(self, event): # R1 results dir 1
- backup = self.resultsdir_r11.GetValue()
- r1_savedir[0] = opendir('Select results directory',
default=self.resultsdir_r11.GetValue())
- if r1_savedir[0] == None:
- r1_savedir[0] = backup
- self.resultsdir_r11.SetValue(r1_savedir[0])
-
- event.Skip()
-
-
def resdir_r1_2(self, event): # wxGlade: main.<event_handler>
backup = self.resultsdir_r11_copy.GetValue()
r1_savedir[1] = opendir('Select results directory',
self.resultsdir_r11_copy.GetValue())
r10545 - /branches/bieri_gui/gui_bieri/relax_gui.py