r21630 - in /branches/relax_disp: ./ gui/analyses/auto_model_free.py -- November 24, 2013 - 19:40

Author: bugman
Date: Sun Nov 24 19:40:31 2013
New Revision: 21630

URL: http://svn.gna.org/viewcvs/relax?rev=21630&view=rev
Log:
Merged revisions 21629 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r21629 | bugman | 2013-11-24 19:40:02 +0100 (Sun, 24 Nov 2013) | 5 lines
  
  Fixes for broken icon names in the model-free GUI auto-analysis tab.
  
  These bugs are not present in released versions of relax.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/analyses/auto_model_free.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Nov 24 19:40:31 2013
@@ -1,1 +1,1 @@
-/trunk:1-21621
+/trunk:1-21629

Modified: branches/relax_disp/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_model_free.py?rev=21630&r1=21629&r2=21630&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_model_free.py (original)
+++ branches/relax_disp/gui/analyses/auto_model_free.py Sun Nov 24 19:40:31 
2013
@@ -539,7 +539,7 @@
         self.max_iter = Spin_ctrl(box, self, text="Maximum interations:", 
default=self.data.max_iter, tooltip="The maximum number of iterations for the 
protocol.  This is the limit for the global looping over the optimisation of 
the model-free models, model elimination, model selection and then 
optimisation of the diffusion tensor.", min=25, max=100, 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
 
         # The calculation mode.
-        self.mode = Text_ctrl(box, self, text="Protocol mode:", 
default='Fully automated', tooltip="Select if the dauvergne_protocol analysis 
will be fully automated or whether the individual global models will be 
optimised separately.", tooltip_button="Open the protocol mode selection 
window.", icon=fetch_icon('oxygen.actions.system_run', "16x16"), 
fn=self.mode_dialog, editable=False, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
+        self.mode = Text_ctrl(box, self, text="Protocol mode:", 
default='Fully automated', tooltip="Select if the dauvergne_protocol analysis 
will be fully automated or whether the individual global models will be 
optimised separately.", tooltip_button="Open the protocol mode selection 
window.", icon=fetch_icon('oxygen.actions.system-run', "16x16"), 
fn=self.mode_dialog, editable=False, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Stretchable spacing (with a minimal space).
         box.AddSpacer(30)
@@ -964,7 +964,7 @@
         sub_sizer.AddStretchSpacer()
 
         # The button.
-        button = wx.BitmapButton(self, -1, 
wx.Bitmap(fetch_icon('oxygen.actions.go_bottom', "48x48"), 
wx.BITMAP_TYPE_ANY))
+        button = wx.BitmapButton(self, -1, 
wx.Bitmap(fetch_icon('oxygen.actions.go-bottom', "48x48"), 
wx.BITMAP_TYPE_ANY))
         button.SetMinSize((80, 80))
         button.SetToolTipString("Perform a fully automated analysis, looping 
over global models I to V and terminating with the final run.  Please click 
on the 'About' button for more information.")
         sub_sizer.Add(button, 3, wx.EXPAND, 0)