Author: bugman
Date: Mon Apr 22 00:52:36 2013
New Revision: 19578
URL: http://svn.gna.org/viewcvs/relax?rev=19578&view=rev
Log:
Merged revisions 19568-19569,19571-19573,19577 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r19568 | bugman | 2013-04-21 23:20:35 +0200 (Sun, 21 Apr 2013) | 5 lines
Unicode is now used for the tau symbol in the model-free model parameter
lists in the GUI.
This is only when modifying the models to optimise, which shouldn't be
changed anyway.
........
r19569 | bugman | 2013-04-21 23:26:59 +0200 (Sun, 21 Apr 2013) | 5 lines
Removed the 'string' from 'Spectrum ID string' in the spectrum list GUI
element.
This is a GUI - the word string is meaningless here!
........
r19571 | bugman | 2013-04-21 23:29:41 +0200 (Sun, 21 Apr 2013) | 3 lines
The delay times column string now specifies seconds in the spectrum list
GUI element.
........
r19572 | bugman | 2013-04-21 23:45:00 +0200 (Sun, 21 Apr 2013) | 5 lines
Formatting improvements for the relaxation data list GUI element.
The data type column entries are now descriptive and use subscript.
........
r19573 | bugman | 2013-04-21 23:52:08 +0200 (Sun, 21 Apr 2013) | 3 lines
More unicode strings are used for the GUI for subscripts and Greek letters.
........
r19577 | bugman | 2013-04-22 00:50:13 +0200 (Mon, 22 Apr 2013) | 5 lines
Fixes for the R1 and R2 GUI analyses for the recently introduced unicode
subscript characters.
There is now self.label for a pure string version and self.gui_label for
the fancier unicode version.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/gui/analyses/auto_model_free.py
branches/relax_disp/gui/analyses/auto_r1.py
branches/relax_disp/gui/analyses/auto_r2.py
branches/relax_disp/gui/analyses/auto_rx_base.py
branches/relax_disp/gui/analyses/wizard.py
branches/relax_disp/gui/components/relax_data.py
branches/relax_disp/gui/components/spectrum.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 22 00:52:36 2013
@@ -1,1 +1,1 @@
-/trunk:1-19563
+/trunk:1-19577
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=19578&r1=19577&r2=19578&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_model_free.py (original)
+++ branches/relax_disp/gui/analyses/auto_model_free.py Mon Apr 22 00:52:36
2013
@@ -830,16 +830,16 @@
"tm9"
]
params = [
- "{local_tm}",
- "{local_tm, S2}",
- "{local_tm, S2, te}",
- "{local_tm, S2, Rex}",
- "{local_tm, S2, te, Rex}",
- "{local_tm, S2, S2f, ts}",
- "{local_tm, S2, tf, S2f, ts}",
- "{local_tm, S2, S2f, ts, Rex}",
- "{local_tm, S2, tf, S2f, ts, Rex}",
- "{local_tm, Rex}"
+ u"{local \u03C4m}",
+ u"{local \u03C4m, S2}",
+ u"{local \u03C4m, S2, \u03C4e}",
+ u"{local \u03C4m, S2, Rex}",
+ u"{local \u03C4m, S2, \u03C4e, Rex}",
+ u"{local \u03C4m, S2, S2f, \u03C4s}",
+ u"{local \u03C4m, S2, \u03C4f, S2f, \u03C4s}",
+ u"{local \u03C4m, S2, S2f, \u03C4s, Rex}",
+ u"{local \u03C4m, S2, \u03C4f, S2f, \u03C4s, Rex}",
+ u"{local \u03C4m, Rex}"
]
warning = "The model-free models used in dauvergne_protocol
auto-analysis should almost never be changed! The consequences will be
unpredictable. Please proceed only if you are sure of what you are doing.
Would you like to modify the model-free model list?"
red_flag = True
@@ -866,16 +866,16 @@
"m9"
]
params = [
- "{}",
- "{S2}",
- "{S2, te}",
- "{S2, Rex}",
- "{S2, te, Rex}",
- "{S2, S2f, ts}",
- "{S2, tf, S2f, ts}",
- "{S2, S2f, ts, Rex}",
- "{S2, tf, S2f, ts, Rex}",
- "{Rex}"
+ u"{}",
+ u"{S2}",
+ u"{S2, \u03C4e}",
+ u"{S2, Rex}",
+ u"{S2, \u03C4e, Rex}",
+ u"{S2, S2f, \u03C4s}",
+ u"{S2, \u03C4f, S2f, \u03C4s}",
+ u"{S2, S2f, \u03C4s, Rex}",
+ u"{S2, \u03C4f, S2f, \u03C4s, Rex}",
+ u"{Rex}"
]
warning = "The model-free models used in dauvergne_protocol
auto-analysis should almost never be changed! The consequences will be
unpredictable. Please proceed only if you are sure of what you are doing.
Would you like to modify the model-free model list?"
red_flag = True
@@ -975,7 +975,7 @@
# The local_tm button.
button = wx.Button(self, -1, u"Local \u03C4m")
- button.SetToolTipString("Optimise global model I, the local tm
models. Please click on the 'About' button for more information.")
+ button.SetToolTipString(u"Optimise global model I, the local \u03C4m
models. Please click on the 'About' button for more information.")
button.SetFont(font.normal)
sub_sizer.Add(button, 1, wx.EXPAND, 0)
self.Bind(wx.EVT_BUTTON, self.select_local_tm, button)
Modified: branches/relax_disp/gui/analyses/auto_r1.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_r1.py?rev=19578&r1=19577&r2=19578&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_r1.py (original)
+++ branches/relax_disp/gui/analyses/auto_r1.py Mon Apr 22 00:52:36 2013
@@ -34,4 +34,5 @@
analysis_type = 'r1'
bitmap = [ANALYSIS_IMAGE_PATH+"r1_200x200.png",
IMAGE_PATH+'r1.png']
- label = 'R1'
+ label = "R1"
+ gui_label = u"R\u2081"
Modified: branches/relax_disp/gui/analyses/auto_r2.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_r2.py?rev=19578&r1=19577&r2=19578&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_r2.py (original)
+++ branches/relax_disp/gui/analyses/auto_r2.py Mon Apr 22 00:52:36 2013
@@ -34,4 +34,5 @@
analysis_type = 'r2'
bitmap = [ANALYSIS_IMAGE_PATH+"r2_200x200.png",
IMAGE_PATH+'r2.png']
- label = 'R2'
+ label = "R2"
+ gui_label = u"R\u2082"
Modified: branches/relax_disp/gui/analyses/auto_rx_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_rx_base.py?rev=19578&r1=19577&r2=19578&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_rx_base.py (original)
+++ branches/relax_disp/gui/analyses/auto_rx_base.py Mon Apr 22 00:52:36 2013
@@ -199,13 +199,13 @@
box = wx.BoxSizer(wx.VERTICAL)
# Add the frame title.
- self.add_title(box, "Setup for %s relaxation analysis" % self.label)
+ self.add_title(box, "Setup for %s relaxation analysis" %
self.gui_label)
# Display the data pipe.
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.gui_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,
tooltip="The directory in which all automatically created files will be
saved.", tooltip_button="Select the results directory.",
fn=self.results_directory, button=True, width_text=self.width_text,
width_button=self.width_button, spacer=self.spacer_horizontal)
Modified: branches/relax_disp/gui/analyses/wizard.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/wizard.py?rev=19578&r1=19577&r2=19578&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/wizard.py (original)
+++ branches/relax_disp/gui/analyses/wizard.py Mon Apr 22 00:52:36 2013
@@ -131,7 +131,7 @@
# Class variables.
image_path = paths.WIZARD_IMAGE_PATH + 'pipe.png'
- main_text = 'Select the name of the data pipe used at the start of the
analysis and the name of the data pipe bundle to be associated with this
analysis. All data in relax is kept within a special structure known as the
relax data store. This store is composed of multiple data pipes, each being
associated with a specific analysis type. Data pipe bundles are simple
groupings of the pipes within the data store and each analysis tab is coupled
to a specific bundle.\n\nSimple analyses such as the steady-state NOE and the
R1 and R2 curve-fitting will be located within a single data pipe. More
complex analyses such as the automated model-free analysis will be spread
across multiple data pipes, internally created by forking the original data
pipe which holds the input data, all grouped together within a single
bundle.\n\nThe initialisation of a new analysis will call the pipe.create
user function with the pipe name and pipe bundle as given below.'
+ main_text = u"Select the name of the data pipe used at the start of the
analysis and the name of the data pipe bundle to be associated with this
analysis. All data in relax is kept within a special structure known as the
relax data store. This store is composed of multiple data pipes, each being
associated with a specific analysis type. Data pipe bundles are simple
groupings of the pipes within the data store and each analysis tab is coupled
to a specific bundle.\n\nSimple analyses such as the steady-state NOE and the
R\u2081 and R\u2082 curve-fitting will be located within a single data pipe.
More complex analyses such as the automated model-free analysis will be
spread across multiple data pipes, internally created by forking the original
data pipe which holds the input data, all grouped together within a single
bundle.\n\nThe initialisation of a new analysis will call the pipe.create
user function with the pipe name and pipe bundle as given below."
title = 'Data pipe set up'
def add_contents(self, sizer):
@@ -204,7 +204,7 @@
# Class variables.
image_path = paths.IMAGE_PATH + "relax.gif"
- main_text = "A number of automatic analyses to be preformed using relax
in GUI mode. Although not as flexible or powerful as the prompt/scripting
modes, this provides a quick and easy setup and execution for a number of
analysis types. These currently include the calculation of the steady-state
NOE, the exponential curve-fitting for the R1 and R2 relaxation rates, and
for a full and automatic model-free analysis using the d'Auvergne and Gooley,
2008b protocol. All analyses perform error propagation using the gold
standard Monte Calro simulations. Please select from one of the following
analysis types:"
+ main_text = u"A number of automatic analyses to be preformed using relax
in GUI mode. Although not as flexible or powerful as the prompt/scripting
modes, this provides a quick and easy setup and execution for a number of
analysis types. These currently include the calculation of the steady-state
NOE, the exponential curve-fitting for the R\u2081 and R\u2082 relaxation
rates, and for a full and automatic model-free analysis using the d'Auvergne
and Gooley, 2008b protocol. All analyses perform error propagation using the
gold standard Monte Calro simulations. Please select from one of the
following analysis types:"
title = "Start a new analysis"
def add_artwork(self, sizer):
@@ -262,10 +262,10 @@
self.button_noe = self.create_button(id=self.button_ids['noe'],
box=sizer1, size=size, bmp=paths.ANALYSIS_IMAGE_PATH+"noe_150x150.png",
tooltip="Steady-state NOE analysis", fn=self.select_noe)
# The R1 button.
- self.button_r1 = self.create_button(id=self.button_ids['r1'],
box=sizer1, size=size, bmp=paths.ANALYSIS_IMAGE_PATH+"r1_150x150.png",
tooltip="R1 relaxation curve-fitting analysis", fn=self.select_r1)
+ self.button_r1 = self.create_button(id=self.button_ids['r1'],
box=sizer1, size=size, bmp=paths.ANALYSIS_IMAGE_PATH+"r1_150x150.png",
tooltip=u"R\u2081 relaxation curve-fitting analysis", fn=self.select_r1)
# The R2 button.
- self.button_r2 = self.create_button(id=self.button_ids['r2'],
box=sizer1, size=size, bmp=paths.ANALYSIS_IMAGE_PATH+"r2_150x150.png",
tooltip="R2 relaxation curve-fitting analysis", fn=self.select_r2)
+ self.button_r2 = self.create_button(id=self.button_ids['r2'],
box=sizer1, size=size, bmp=paths.ANALYSIS_IMAGE_PATH+"r2_150x150.png",
tooltip=u"R\u2082 relaxation curve-fitting analysis", fn=self.select_r2)
# The model-free button.
self.button_mf = self.create_button(id=self.button_ids['mf'],
box=sizer1, size=size,
bmp=paths.ANALYSIS_IMAGE_PATH+"model_free"+sep+"model_free_150x150.png",
tooltip="Model-free analysis", fn=self.select_mf)
@@ -450,7 +450,7 @@
self.toggle(self.button_r1)
# Update the analysis name.
- self.analysis_name.SetValue(str_to_gui('R1 relaxation'))
+ self.analysis_name.SetValue(str_to_gui("R1 relaxation"))
# Set the analysis type.
self.parent.analysis_type = 'r1'
@@ -467,7 +467,7 @@
self.toggle(self.button_r2)
# Update the analysis name.
- self.analysis_name.SetValue(str_to_gui('R2 relaxation'))
+ self.analysis_name.SetValue(str_to_gui("R2 relaxation"))
# Set the analysis type.
self.parent.analysis_type = 'r2'
Modified: branches/relax_disp/gui/components/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/components/relax_data.py?rev=19578&r1=19577&r2=19578&view=diff
==============================================================================
--- branches/relax_disp/gui/components/relax_data.py (original)
+++ branches/relax_disp/gui/components/relax_data.py Mon Apr 22 00:52:36 2013
@@ -301,6 +301,13 @@
def update_data(self):
"""Method called from self.build_element_safe() to update the list
data."""
+ # Translation table for the Rx data types.
+ table = {
+ "NOE": "Steady-state NOE",
+ "R1": u"R\u2081 longitudinal relaxation",
+ "R2": u"R\u2082 transverse relaxation"
+ }
+
# Expand the number of rows to match the number of relaxation IDs,
and add the IDs.
n = 0
if hasattr(cdp, 'ri_ids'):
@@ -314,7 +321,7 @@
self.element.InsertStringItem(i, str_to_gui(id))
# Set the data types.
- self.element.SetStringItem(i, 1, str_to_gui(cdp.ri_type[id]))
+ self.element.SetStringItem(i, 1,
str_to_gui(table[cdp.ri_type[id]]))
# Set the frequencies.
self.element.SetStringItem(i, 2, float_to_gui(cdp.frq[id]))
Modified: branches/relax_disp/gui/components/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/components/spectrum.py?rev=19578&r1=19577&r2=19578&view=diff
==============================================================================
--- branches/relax_disp/gui/components/spectrum.py (original)
+++ branches/relax_disp/gui/components/spectrum.py Mon Apr 22 00:52:36 2013
@@ -401,7 +401,7 @@
return False
# Append a column.
- self.element.InsertColumn(index, str_to_gui("Delay times"))
+ self.element.InsertColumn(index, str_to_gui("Delay times (s)"))
# Set the values.
for i in range(len(cdp.spectrum_ids)):
@@ -554,7 +554,7 @@
self.element.DeleteAllColumns()
# Initialise to a single column.
- self.element.InsertColumn(0, str_to_gui("Spectrum ID string"))
+ self.element.InsertColumn(0, str_to_gui("Spectrum ID"))
# Expand the number of rows to match the number of spectrum IDs, and
add the IDs.
n = 0
r19578 - in /branches/relax_disp: ./ gui/analyses/ gui/components/