Author: bugman
Date: Sun Apr 21 23:52:08 2013
New Revision: 19573
URL: http://svn.gna.org/viewcvs/relax?rev=19573&view=rev
Log:
More unicode strings are used for the GUI for subscripts and Greek letters.
Modified:
trunk/gui/analyses/auto_model_free.py
trunk/gui/analyses/auto_r1.py
trunk/gui/analyses/auto_r2.py
trunk/gui/analyses/wizard.py
Modified: trunk/gui/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_model_free.py?rev=19573&r1=19572&r2=19573&view=diff
==============================================================================
--- trunk/gui/analyses/auto_model_free.py (original)
+++ trunk/gui/analyses/auto_model_free.py Sun Apr 21 23:52:08 2013
@@ -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: trunk/gui/analyses/auto_r1.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_r1.py?rev=19573&r1=19572&r2=19573&view=diff
==============================================================================
--- trunk/gui/analyses/auto_r1.py (original)
+++ trunk/gui/analyses/auto_r1.py Sun Apr 21 23:52:08 2013
@@ -34,4 +34,4 @@
analysis_type = 'r1'
bitmap = [ANALYSIS_IMAGE_PATH+"r1_200x200.png",
IMAGE_PATH+'r1.png']
- label = 'R1'
+ label = u"R\u2081"
Modified: trunk/gui/analyses/auto_r2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_r2.py?rev=19573&r1=19572&r2=19573&view=diff
==============================================================================
--- trunk/gui/analyses/auto_r2.py (original)
+++ trunk/gui/analyses/auto_r2.py Sun Apr 21 23:52:08 2013
@@ -34,4 +34,4 @@
analysis_type = 'r2'
bitmap = [ANALYSIS_IMAGE_PATH+"r2_200x200.png",
IMAGE_PATH+'r2.png']
- label = 'R2'
+ label = u"R\u2082"
Modified: trunk/gui/analyses/wizard.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/wizard.py?rev=19573&r1=19572&r2=19573&view=diff
==============================================================================
--- trunk/gui/analyses/wizard.py (original)
+++ trunk/gui/analyses/wizard.py Sun Apr 21 23:52:08 2013
@@ -104,7 +104,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):
@@ -177,7 +177,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):
@@ -233,10 +233,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)
# Consistency testing.
self.button_consist_test =
self.create_button(id=self.button_ids['consist_test'], box=sizer2, size=size,
bmp=paths.ANALYSIS_IMAGE_PATH+"consistency_testing_150x70.png",
tooltip="Relaxation data consistency testing", fn=self.select_consist_test,
disabled=True)
@@ -397,7 +397,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'
@@ -414,7 +414,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'
r19573 - in /trunk/gui/analyses: auto_model_free.py auto_r1.py auto_r2.py wizard.py