Author: bugman Date: Fri Jun 10 10:16:14 2011 New Revision: 12952 URL: http://svn.gna.org/viewcvs/relax?rev=12952&view=rev Log: Shifted the model-free window build_main_box() method to the base class. Modified: 1.3/gui/analyses/auto_model_free.py 1.3/gui/analyses/base.py Modified: 1.3/gui/analyses/auto_model_free.py URL: http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_model_free.py?rev=12952&r1=12951&r2=12952&view=diff ============================================================================== --- 1.3/gui/analyses/auto_model_free.py (original) +++ 1.3/gui/analyses/auto_model_free.py Fri Jun 10 10:16:14 2011 @@ -743,25 +743,6 @@ return left_box - def build_main_box(self, box): - """Construct the highest level box to pack into the automatic model-free analysis frame. - - @param box: The horizontal box element to pack the elements into. - @type box: wx.BoxSizer instance - """ - - # Build the left hand box and add to the main box. - left_box = self.build_left_box() - box.Add(left_box, 0, wx.ADJUST_MINSIZE, 0) - - # Central spacer. - box.AddSpacer(self.border) - - # Build the right hand box and pack it next to the bitmap. - right_box = self.build_right_box() - box.Add(right_box, 1, 0, 0) - - def build_right_box(self): """Construct the right hand box to pack into the main model-free box. Modified: 1.3/gui/analyses/base.py URL: http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/base.py?rev=12952&r1=12951&r2=12952&view=diff ============================================================================== --- 1.3/gui/analyses/base.py (original) +++ 1.3/gui/analyses/base.py Fri Jun 10 10:16:14 2011 @@ -251,6 +251,25 @@ box.AddSpacer(5) + def build_main_box(self, box): + """Construct the highest level box to pack into the automatic analysis frames. + + @param box: The horizontal box element to pack the elements into. + @type box: wx.BoxSizer instance + """ + + # Build the left hand box and add to the main box. + left_box = self.build_left_box() + box.Add(left_box, 0, wx.ADJUST_MINSIZE, 0) + + # Central spacer. + box.AddSpacer(self.border) + + # Build the right hand box and pack it next to the bitmap. + right_box = self.build_right_box() + box.Add(right_box, 1, 0, 0) + + def setup_analysis_element(self, parent): """Set up the specific analysis GUI element.