Author: bugman Date: Fri Jan 29 13:20:40 2010 New Revision: 10594 URL: http://svn.gna.org/viewcvs/relax?rev=10594&view=rev Log: Deleted __do_layout() and __set_properties(). These were not being used and contained code not belonging to the automatic Rx analysis frames. 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=10594&r1=10593&r2=10594&view=diff ============================================================================== --- branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py (original) +++ branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py Fri Jan 29 13:20:40 2010 @@ -81,142 +81,6 @@ self.parent.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - def __do_layout(self): - # begin wxGlade: main.__do_layout - sizer_8 = wx.BoxSizer(wx.VERTICAL) - sizer_9 = wx.BoxSizer(wx.VERTICAL) - sizer_22_copy_copy = wx.BoxSizer(wx.VERTICAL) - sizer_23_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_22_copy = wx.BoxSizer(wx.VERTICAL) - sizer_23_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_22 = wx.BoxSizer(wx.VERTICAL) - sizer_23 = wx.BoxSizer(wx.HORIZONTAL) - sizer_17_copy_copy = wx.BoxSizer(wx.VERTICAL) - sizer_19_copy_copy_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_19_copy_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_19_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_18_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_17_copy = wx.BoxSizer(wx.VERTICAL) - sizer_19_copy_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_19_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_19_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_18_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_19_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_19_copy = wx.BoxSizer(wx.HORIZONTAL) - frq1sub_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_10_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_11_copy_copy_1 = wx.BoxSizer(wx.VERTICAL) - exec_relax_copy_1_copy_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_12_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - grid_sizer_1_copy_copy_1 = wx.FlexGridSizer(10, 2, 0, 0) - sizer_13_copy_copy_1 = wx.BoxSizer(wx.VERTICAL) - nmr_freq_copy_copy_copy_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - nmr_freq_copy_copy_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_10_copy_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_11_copy_2 = wx.BoxSizer(wx.VERTICAL) - exec_relax_copy_1_copy_copy_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_12_copy_2 = wx.BoxSizer(wx.HORIZONTAL) - grid_sizer_1_copy_2 = wx.FlexGridSizer(10, 2, 0, 0) - sizer_13_copy_2 = wx.BoxSizer(wx.VERTICAL) - nmr_freq_copy_copy_copy_copy_2 = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_copy_2 = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_3 = wx.BoxSizer(wx.HORIZONTAL) - nmr_freq_copy_copy_copy_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_copy_1_copy_1 = wx.BoxSizer(wx.VERTICAL) - exec_relax_copy_1_copy_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - unresolved_resi_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - pdbfile_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_8_copy_copy_copy_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - nmr_freq_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - frq1sub_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_10_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_11_copy_copy = wx.BoxSizer(wx.VERTICAL) - exec_relax_copy_1_copy_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_12_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - grid_sizer_1_copy_copy = wx.FlexGridSizer(10, 2, 0, 0) - sizer_13_copy_copy = wx.BoxSizer(wx.VERTICAL) - nmr_freq_copy_copy_copy_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - nmr_freq_copy_copy_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_10_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_11_copy_1 = wx.BoxSizer(wx.VERTICAL) - exec_relax_copy_1_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_12_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - grid_sizer_1_copy_1 = wx.FlexGridSizer(10, 2, 0, 0) - sizer_13_copy_1 = wx.BoxSizer(wx.VERTICAL) - nmr_freq_copy_copy_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_2 = wx.BoxSizer(wx.HORIZONTAL) - nmr_freq_copy_copy_copy_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_copy_1_copy = wx.BoxSizer(wx.VERTICAL) - exec_relax_copy_1_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - unresolved_resi_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - pdbfile_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_8_copy_copy_copy_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - nmr_freq_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) - frq1sub = wx.BoxSizer(wx.HORIZONTAL) - sizer_10_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_11_copy = wx.BoxSizer(wx.VERTICAL) - exec_relax_copy_1_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - sizer_12_copy = wx.BoxSizer(wx.HORIZONTAL) - grid_sizer_1_copy = wx.FlexGridSizer(10, 2, 0, 0) - sizer_13_copy = wx.BoxSizer(wx.VERTICAL) - nmr_freq_copy_copy_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_copy = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - nmr_freq_copy_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_6_copy_1 = wx.BoxSizer(wx.VERTICAL) - exec_relax_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - results_dir_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - unresolved_resi_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - pdbfile_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_8_copy_copy_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - - # A grid sizer for the peak list info. - sizer_11.Add(results_dir_copy_copy, 1, wx.EXPAND, 0) - 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) - - sizer_8.Add(self.notebook_2, 1, wx.EXPAND, 0) - self.SetSizer(sizer_8) - self.Layout() - self.SetSize((1000, 600)) - self.Centre() - - - def __set_properties(self): - # begin wxGlade: main.__set_properties - self.label_4_copy_1.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Sans")) - self.label_2_copy_copy_copy_3.SetMinSize((230, 17)) - self.label_2_copy_copy_5.SetMinSize((230, 17)) - self.label_2_copy_copy_2_copy_1.SetMinSize((230, 17)) - self.label_2_copy_copy_3_copy_1.SetMinSize((230, 17)) - 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)) - self.label_2_copy_copy_3_copy_copy_copy.SetMinSize((230, 17)) - - self.panel_3_copy_copy_1.SetMinSize((620, 300)) - self.panel_3_copy_copy_1.SetBackgroundColour(wx.Colour(192, 192, 192)) - self.panel_1_copy_copy_1.SetMinSize((688, 300)) - self.panel_1_copy_copy_1.SetBackgroundColour(wx.Colour(192, 192, 192)) - self.label_5_copy_1_copy_copy_copy_1.SetMinSize((118, 17)) - self.relax_start_r1_1_copy_copy_1.SetName('hello') - self.relax_start_r1_1_copy_copy_1.SetSize(self.relax_start_r1_1_copy_copy_1.GetBestSize()) - - def add_execute_relax(self, box): """Create and add the relax execution GUI element to the given box.