r19531 - in /trunk/gui/analyses: auto_model_free.py auto_noe.py auto_rx_base.py base.py -- April 21, 2013 - 14:53

Author: bugman
Date: Sun Apr 21 14:53:58 2013
New Revision: 19531

URL: http://svn.gna.org/viewcvs/relax?rev=19531&view=rev
Log:
Standardisation of the text of the GUI elements of the analysis frames and 
expansion of the tooltips.

All the text parts of the Spin_ctrl and Text_ctrl elements now end in a 
colon.  Tooltips are now
present on all elements and have been expanded and improved.


Modified:
    trunk/gui/analyses/auto_model_free.py
    trunk/gui/analyses/auto_noe.py
    trunk/gui/analyses/auto_rx_base.py
    trunk/gui/analyses/base.py

Modified: trunk/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_model_free.py?rev=19531&r1=19530&r2=19531&view=diff
==============================================================================
--- trunk/gui/analyses/auto_model_free.py (original)
+++ trunk/gui/analyses/auto_model_free.py Sun Apr 21 14:53:58 2013
@@ -511,7 +511,7 @@
         Text_ctrl(box, self, text="The data pipe bundle:", 
default=self.data.pipe_bundle, tooltip="This is the data pipe bundle 
associated with this analysis.", editable=False, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the results directory GUI element.
-        self.field_results_dir = Text_ctrl(box, self, text="Results 
directory", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
+        self.field_results_dir = Text_ctrl(box, self, text="Results 
directory:", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
tooltip="The directory in which all automatically created files will be 
saved.", fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the spin GUI element.
         self.add_spin_systems(box, self)
@@ -538,10 +538,10 @@
         self.mc_sim_num = Spin_ctrl(box, self, text="Monte Carlo simulation 
number:", default=500, min=1, max=100000, tooltip="This is the number of 
Monte Carlo simulations performed for error propagation and analysis.", 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
 
         # Add maximum iteration selector.
-        self.max_iter = Spin_ctrl(box, self, text="Maximum interations", 
default=self.data.max_iter, min=25, max=100, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
+        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 one by one.", icon=paths.icon_16x16.system_run, 
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.", icon=paths.icon_16x16.system_run, 
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)

Modified: trunk/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_noe.py?rev=19531&r1=19530&r2=19531&view=diff
==============================================================================
--- trunk/gui/analyses/auto_noe.py (original)
+++ trunk/gui/analyses/auto_noe.py Sun Apr 21 14:53:58 2013
@@ -200,10 +200,10 @@
         Text_ctrl(box, self, text="The data pipe bundle:", 
default=self.data.pipe_bundle, tooltip="This is the data pipe bundle 
associated with this analysis.", editable=False, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the frequency selection GUI element.
-        self.field_nmr_frq = Text_ctrl(box, self, text="NMR frequency label 
[MHz]", default=self.data.frq, tooltip="This label is added to the output 
files.  For example if the label is '600', the NOE values will be located in 
the file 'noe.600.out'.", width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
+        self.field_nmr_frq = Text_ctrl(box, self, text="NMR frequency label 
[MHz]:", default=self.data.frq, tooltip="This label is added to the output 
files.  For example if the label is '600', the NOE values will be located in 
the file 'noe.600.out'.", width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the results directory GUI element.
-        self.field_results_dir = Text_ctrl(box, self, text="Results 
directory", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
+        self.field_results_dir = Text_ctrl(box, self, text="Results 
directory:", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
tooltip="The directory in which all automatically created files will be 
saved.", fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the spin GUI element.
         self.add_spin_systems(box, self)

Modified: trunk/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_rx_base.py?rev=19531&r1=19530&r2=19531&view=diff
==============================================================================
--- trunk/gui/analyses/auto_rx_base.py (original)
+++ trunk/gui/analyses/auto_rx_base.py Sun Apr 21 14:53:58 2013
@@ -211,10 +211,10 @@
         Text_ctrl(box, self, text="The data pipe bundle:", 
default=self.data.pipe_bundle, tooltip="This is the data pipe bundle 
associated with this analysis.", editable=False, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the frequency selection GUI element.
-        self.field_nmr_frq = Text_ctrl(box, self, text="NMR frequency label 
[MHz]", default=self.data.frq, tooltip="This label is added to the output 
files.  For example if the label is '600', the %s values will be located in 
the file '%s.600.out'." % (self.label, self.label.lower()), 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
+        self.field_nmr_frq = Text_ctrl(box, self, text="NMR frequency label 
[MHz]:", default=self.data.frq, tooltip="This label is added to the output 
files.  For example if the label is '600', the %s values will be located in 
the file '%s.600.out'." % (self.label, self.label.lower()), 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
 
         # Add the results directory GUI element.
-        self.field_results_dir = Text_ctrl(box, self, text="Results 
directory", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
+        self.field_results_dir = Text_ctrl(box, self, text="Results 
directory:", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
tooltip="The directory in which all automatically created files will be 
saved.", fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the spin GUI element.
         self.add_spin_systems(box, self)

Modified: trunk/gui/analyses/base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/base.py?rev=19531&r1=19530&r2=19531&view=diff
==============================================================================
--- trunk/gui/analyses/base.py (original)
+++ trunk/gui/analyses/base.py Sun Apr 21 14:53:58 2013
@@ -215,7 +215,7 @@
         """
 
         # Add the element.
-        self.spin_systems = Text_ctrl(box, self, text="Spin systems", 
button_text=" Spin editor", default=self.spin_count(), 
icon=paths.icon_16x16.spin, fn=self.launch_spin_editor, editable=False, 
button=True, width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
+        self.spin_systems = Text_ctrl(box, self, text="Spin systems:", 
button_text=" Spin editor", default=self.spin_count(), tooltip="The currently 
loaded molecule, residue, and spin sequence.", icon=paths.icon_16x16.spin, 
fn=self.launch_spin_editor, editable=False, button=True, 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
 
 
     def add_static_text(self, box, parent, text='', width=-1, height=-1):