Author: bugman
Date: Wed Sep 4 10:55:43 2013
New Revision: 20795
URL: http://svn.gna.org/viewcvs/relax?rev=20795&view=rev
Log:
Unicode strings in the dispersion GUI elements is now set up with the
compat.u() function.
Modified:
branches/relax_disp/gui/analyses/auto_relax_disp.py
branches/relax_disp/gui/components/spectrum.py
branches/relax_disp/user_functions/relax_disp.py
Modified: branches/relax_disp/gui/analyses/auto_relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_relax_disp.py?rev=20795&r1=20794&r2=20795&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Wed Sep 4 10:55:43
2013
@@ -27,6 +27,7 @@
# relax module imports.
from auto_analyses.relax_disp import Relax_disp
+from compat import u
from data_store import Relax_data_store; ds = Relax_data_store()
from graphics import ANALYSIS_IMAGE_PATH, fetch_icon
from gui.analyses.base import Base_analysis
@@ -213,11 +214,11 @@
sizer.Add(self.button_isotope, 1, wx.ALL|wx.EXPAND, 0)
# R1 button.
- self.button_r1 = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1,
None, u" R\u2081 relaxation data")
+ self.button_r1 = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1,
None, u(" R\u2081 relaxation data"))
self.button_r1.SetBitmapLabel(wx.Bitmap(fetch_icon("relax.fid",
"22x22"), wx.BITMAP_TYPE_ANY))
self.button_r1.SetFont(font.normal)
self.button_r1.SetSize((-1, 25))
- self.button_r1.SetToolTipString(u"Load the R\u2081 relaxation data
for the off-resonance R\u2081\u1D68-type experiments. For all other
experiment types this is unused. One R\u2081 data set per magnetic field
strength must be loaded.")
+ self.button_r1.SetToolTipString(u("Load the R\u2081 relaxation data
for the off-resonance R\u2081\u1D68-type experiments. For all other
experiment types this is unused. One R\u2081 data set per magnetic field
strength must be loaded."))
self.gui.Bind(wx.EVT_BUTTON, self.load_r1_data, self.button_r1)
sizer.Add(self.button_r1, 1, wx.ALL|wx.EXPAND, 0)
@@ -226,7 +227,7 @@
self.button_chemical_shift.SetBitmapLabel(wx.Bitmap(fetch_icon("relax.chemical_shift",
"22x22"), wx.BITMAP_TYPE_ANY))
self.button_chemical_shift.SetFont(font.normal)
self.button_chemical_shift.SetSize((-1, 25))
- self.button_chemical_shift.SetToolTipString(u"Read chemical shifts
from a peak list for the off-resonance R\u2081\u1D68-type experiments. For
all other experiment types this is unused.")
+ self.button_chemical_shift.SetToolTipString(u("Read chemical shifts
from a peak list for the off-resonance R\u2081\u1D68-type experiments. For
all other experiment types this is unused."))
self.gui.Bind(wx.EVT_BUTTON, self.load_cs_data,
self.button_chemical_shift)
sizer.Add(self.button_chemical_shift, 1, wx.ALL|wx.EXPAND, 0)
@@ -308,8 +309,8 @@
table = {
"cpmg fixed": "CPMG-type experiment - fixed relaxation time
period",
"cpmg exponential": "CPMG-type experiment - Full exponential
curve",
- "r1rho fixed": u"R\u2081\u1D68-type experiment - fixed
relaxation time period",
- "r1rho exponential": u"R\u2081\u1D68-type experiment - full
exponential curve"
+ "r1rho fixed": u("R\u2081\u1D68-type experiment - fixed
relaxation time period"),
+ "r1rho exponential": u("R\u2081\u1D68-type experiment - full
exponential curve")
}
Text_ctrl(box, self, text="Experiment type:",
default=table[cdp.exp_type], tooltip="The relaxation dispersion experiment
type. The %s experiment type was selected in the new analysis wizard and can
no longer be changed."%table[cdp.exp_type], editable=False,
width_text=self.width_text, width_button=self.width_button,
spacer=self.spacer_horizontal)
@@ -670,18 +671,18 @@
MODEL_NS_CPMG_2SITE_EXPANDED
]
params = [
- u"{R\u2082eff, I\u2080}",
- u"{R\u2082, ...}",
- u"{R\u2082, ..., \u03D5\u2091\u2093, k\u2091\u2093}",
- u"{R\u2082, ..., \u03D5\u2091\u2093B, kB, \u03D5\u2091\u2093C, kC}",
- u"{R\u2082, ..., pA, d\u03C9, k\u2091\u2093}",
- u"{R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}",
- u"{R\u2082, ..., \u03D5\u2091\u2093, pA.d\u03C9\u00B2,
k\u2091\u2093}",
- u"{R\u2082, ..., pA, d\u03C9, k\u2091\u2093}",
- u"{R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}",
- u"{R\u2082, ..., pA, d\u03C9, k\u2091\u2093}",
- u"{R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}",
- u"{R\u2082, ..., pA, d\u03C9, k\u2091\u2093}"
+ u("{R\u2082eff, I\u2080}"),
+ u("{R\u2082, ...}"),
+ u("{R\u2082, ..., \u03D5\u2091\u2093, k\u2091\u2093}"),
+ u("{R\u2082, ..., \u03D5\u2091\u2093B, kB, \u03D5\u2091\u2093C,
kC}"),
+ u("{R\u2082, ..., pA, d\u03C9, k\u2091\u2093}"),
+ u("{R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}"),
+ u("{R\u2082, ..., \u03D5\u2091\u2093, pA.d\u03C9\u00B2,
k\u2091\u2093}"),
+ u("{R\u2082, ..., pA, d\u03C9, k\u2091\u2093}"),
+ u("{R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}"),
+ u("{R\u2082, ..., pA, d\u03C9, k\u2091\u2093}"),
+ u("{R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}"),
+ u("{R\u2082, ..., pA, d\u03C9, k\u2091\u2093}")
]
tooltip = "The list of all relaxation dispersion models to be optimised
as part of the protocol."
tooltip_button = "Open the model list selector window."
@@ -703,13 +704,13 @@
MODEL_NS_R1RHO_2SITE
]
params = [
- u"{R\u2081\u1D68, I\u2080}",
- u"{R\u2081\u1D68', ...}",
- u"{R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}",
- u"{R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}",
- u"{R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}",
- u"{R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}",
- u"{R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}"
+ u("{R\u2081\u1D68, I\u2080}"),
+ u("{R\u2081\u1D68', ...}"),
+ u("{R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}"),
+ u("{R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}"),
+ u("{R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}"),
+ u("{R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}"),
+ u("{R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}")
]
tooltip = "The list of all relaxation dispersion models to be optimised
as part of the protocol."
tooltip_button = "Open the model list selector window."
Modified: branches/relax_disp/gui/components/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/components/spectrum.py?rev=20795&r1=20794&r2=20795&view=diff
==============================================================================
--- branches/relax_disp/gui/components/spectrum.py (original)
+++ branches/relax_disp/gui/components/spectrum.py Wed Sep 4 10:55:43 2013
@@ -28,6 +28,7 @@
import wx.lib.buttons
# relax module imports.
+from compat import u
from graphics import fetch_icon
from gui.components.base_list import Base_list
from gui.string_conv import float_to_gui, gui_to_str, str_to_gui
@@ -274,7 +275,7 @@
return False
# Append a column.
- self.element.InsertColumn(index, u"\u03BDCPMG (Hz)")
+ self.element.InsertColumn(index, u("\u03BDCPMG (Hz)"))
# Set the values.
for i in range(len(cdp.spectrum_ids)):
@@ -303,7 +304,7 @@
return False
# Append a column.
- self.element.InsertColumn(index, u"\u03C9H (MHz)")
+ self.element.InsertColumn(index, u("\u03C9H (MHz)"))
# Set the values.
for i in range(len(cdp.spectrum_ids)):
@@ -332,7 +333,7 @@
return False
# Append a column.
- self.element.InsertColumn(index, u"Spin-lock \u03BD1 (Hz)")
+ self.element.InsertColumn(index, u("Spin-lock \u03BD1 (Hz)"))
# Set the values.
for i in range(len(cdp.spectrum_ids)):
@@ -525,14 +526,14 @@
if self.spin_lock_flag:
self.popup_menus.append({
'id': wx.NewId(),
- 'text': u"Set the spin-&lock field strength \u03BD1",
+ 'text': u("Set the spin-&lock field strength \u03BD1"),
'icon': fetch_icon("relax.relax_disp"),
'method': self.action_relax_disp_spin_lock_field
})
if self.cpmg_frq_flag:
self.popup_menus.append({
'id': wx.NewId(),
- 'text': u"Set the &CPMG pulse frequency \u03BDCPMG",
+ 'text': u("Set the &CPMG pulse frequency \u03BDCPMG"),
'icon': fetch_icon("relax.relax_disp"),
'method': self.action_relax_disp_cpmg_frq
})
Modified: branches/relax_disp/user_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_disp.py?rev=20795&r1=20794&r2=20795&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_disp.py (original)
+++ branches/relax_disp/user_functions/relax_disp.py Wed Sep 4 10:55:43 2013
@@ -32,6 +32,7 @@
FD_SAVE = -1
# relax module imports.
+from compat import u
from pipe_control import pipes, spectrum
from pipe_control.mol_res_spin import get_spin_ids
from graphics import ANALYSIS_IMAGE_PATH, WIZARD_IMAGE_PATH
@@ -474,24 +475,24 @@
desc = "The type of relaxation dispersion model to fit.",
wiz_element_type = "combo",
wiz_combo_choices = [
- u"%s: {R\u2082eff/R\u2081\u1D68, I\u2080}" % MODEL_R2EFF,
- u"%s: {R\u2082, ...}" % MODEL_NOREX,
- u"%s: {R\u2082, ..., \u03D5\u2091\u2093, k\u2091\u2093}" %
MODEL_LM63,
- u"%s: {R\u2082, ..., \u03D5\u2091\u2093B, kB, \u03D5\u2091\u2093C,
kC}" % MODEL_LM63_3SITE,
- u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" % MODEL_CR72,
- u"%s: {R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}" %
MODEL_CR72_FULL,
- u"%s: {R\u2082, ..., \u03D5\u2091\u2093, pA.d\u03C9\u00B2,
k\u2091\u2093}" % MODEL_IT99,
- u"%s: {R\u2082A, ..., d\u03C9, kA}" % MODEL_TSMFK01,
- u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" %
MODEL_NS_CPMG_2SITE_3D,
- u"%s: {R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}" %
MODEL_NS_CPMG_2SITE_3D_FULL,
- u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" %
MODEL_NS_CPMG_2SITE_STAR,
- u"%s: {R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}" %
MODEL_NS_CPMG_2SITE_STAR_FULL,
- u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" %
MODEL_NS_CPMG_2SITE_EXPANDED,
- u"%s: {R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}" %
MODEL_M61,
- u"%s: {R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}" %
MODEL_M61B,
- u"%s: {R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}" %
MODEL_DPL94,
- u"%s: {R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}" %
MODEL_TP02,
- u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" %
MODEL_NS_R1RHO_2SITE
+ u("%s: {R\u2082eff/R\u2081\u1D68, I\u2080}") % MODEL_R2EFF,
+ u("%s: {R\u2082, ...}") % MODEL_NOREX,
+ u("%s: {R\u2082, ..., \u03D5\u2091\u2093, k\u2091\u2093}") %
MODEL_LM63,
+ u("%s: {R\u2082, ..., \u03D5\u2091\u2093B, kB, \u03D5\u2091\u2093C,
kC}") % MODEL_LM63_3SITE,
+ u("%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}") % MODEL_CR72,
+ u("%s: {R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}") %
MODEL_CR72_FULL,
+ u("%s: {R\u2082, ..., \u03D5\u2091\u2093, pA.d\u03C9\u00B2,
k\u2091\u2093}") % MODEL_IT99,
+ u("%s: {R\u2082A, ..., d\u03C9, kA}") % MODEL_TSMFK01,
+ u("%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}") %
MODEL_NS_CPMG_2SITE_3D,
+ u("%s: {R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}") %
MODEL_NS_CPMG_2SITE_3D_FULL,
+ u("%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}") %
MODEL_NS_CPMG_2SITE_STAR,
+ u("%s: {R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}") %
MODEL_NS_CPMG_2SITE_STAR_FULL,
+ u("%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}") %
MODEL_NS_CPMG_2SITE_EXPANDED,
+ u("%s: {R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}") %
MODEL_M61,
+ u("%s: {R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}") %
MODEL_M61B,
+ u("%s: {R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}") %
MODEL_DPL94,
+ u("%s: {R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}") %
MODEL_TP02,
+ u("%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}") %
MODEL_NS_R1RHO_2SITE
],
wiz_combo_data = [
MODEL_R2EFF,
r20795 - in /branches/relax_disp: gui/analyses/auto_relax_disp.py gui/components/spectrum.py user_functions/relax_disp.py