Author: bugman Date: Thu Jan 28 20:05:03 2010 New Revision: 10560 URL: http://svn.gna.org/viewcvs/relax?rev=10560&view=rev Log: Spun the self.label_4_copy_copy GUI element out into the add_frame_title() method. 'self.label_4_copy_copy' was renamed to 'label' to shift it out of the class namespace. 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=10560&r1=10559&r2=10560&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 20:05:03 2010 @@ -100,6 +100,22 @@ return box + def add_frame_title(self, box): + """Create and add the frame title to the given box. + + @param box: The box element to pack the frame title into. + @type box: wx.BoxSizer instance + """ + + # The title. + label = wx.StaticText(self.parent, -1, "Set-up for R1 relaxation analysis:") + + # The font properties. + label.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Sans")) + + # Pack the title. + box.Add(label, 0, wx.BOTTOM|wx.ADJUST_MINSIZE, 18) + def build_right_box(self): """Construct the right hand box to pack into the main Rx box. @@ -109,9 +125,11 @@ """ # Use a vertical packing of elements. - sizer_11 = wx.BoxSizer(wx.VERTICAL) - - self.label_4_copy_copy = wx.StaticText(self.parent, -1, "Set-up for R1 relaxation analysis:") + box = wx.BoxSizer(wx.VERTICAL) + + # Add the frame title. + self.add_frame_title(box) + 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) @@ -166,7 +184,7 @@ self.gui.Bind(wx.EVT_BUTTON, self.refresh_r1_1, self.refreshr11) # Return the box. - return sizer_11 + return box def __do_layout(self): @@ -279,7 +297,6 @@ pdbfile_copy_1 = wx.BoxSizer(wx.HORIZONTAL) sizer_8_copy_copy_copy_copy_1 = wx.BoxSizer(wx.HORIZONTAL) - 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) @@ -353,7 +370,6 @@ 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.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))