Author: bugman
Date: Fri Sep 6 19:30:06 2013
New Revision: 20921
URL: http://svn.gna.org/viewcvs/relax?rev=20921&view=rev
Log:
The relaxation dispersion GUI elements now use the lib.text.gui module for
unicode strings.
Modified:
branches/relax_disp/gui/analyses/auto_relax_disp.py
branches/relax_disp/lib/text/gui.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=20921&r1=20920&r2=20921&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Fri Sep 6 19:30:06
2013
@@ -27,7 +27,6 @@
# 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
@@ -45,6 +44,7 @@
from gui.string_conv import gui_to_bool, gui_to_int, gui_to_str, str_to_gui
from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
from gui.wizards.peak_intensity import Peak_intensity_wizard
+from lib.text.gui import dw, i0, kex, padw2, phi_ex, phi_exB, phi_exC, r1,
r1rho, r1rho_prime, r2, r2a, r2b, r2eff
from pipe_control.mol_res_spin import exists_mol_res_spin_data, spin_loop
from pipe_control.pipes import has_bundle, has_pipe
from specific_analyses.relax_disp.disp_data import has_cpmg_exp_type,
has_r1rho_exp_type
@@ -197,11 +197,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, " %s relaxation data"%r1)
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("Load the %s relaxation data for the
off-resonance %s-type experiments. For all other experiment types this is
unused. One %s data set per magnetic field strength must be loaded."%(r1,
r1rho, r1))
self.gui.Bind(wx.EVT_BUTTON, self.load_r1_data, self.button_r1)
sizer.Add(self.button_r1, 1, wx.ALL|wx.EXPAND, 0)
@@ -210,7 +210,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("Read chemical shifts
from a peak list for the off-resonance %s-type experiments. For all other
experiment types this is unused."%r1rho)
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)
@@ -657,26 +657,27 @@
MODEL_NS_R1RHO_2SITE
]
params = [
- u("{R\u2082eff, I\u2080}"),
+ "{%s/%s, %s}" % (r2eff, r1rho, i0),
"",
- u("{R\u2082, ...}"),
+ "{%s, ...}" % (r2),
"",
- 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}"),
+ "{%s, ..., %s, %s}" % (r2, phi_ex, kex),
+ "{%s, ..., %s, kB, %s, kC}" % (r2, phi_exB, phi_exC),
+ "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
+ "{%s, %s, ..., pA, %s, %s}" % (r2a, r2b, dw, kex),
+ "{%s, ..., %s, %s, %s}" % (r2, phi_ex, padw2, kex),
+ "{%s, ..., %s, k_AB}" % (r2a, dw),
+ "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
+ "{%s, %s, ..., pA, %s, %s}" % (r2a, r2b, dw, kex),
+ "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
+ "{%s, %s, ..., pA, %s, %s}" % (r2a, r2b, dw, kex),
+ "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
"",
- 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}")
+ "{%s, ..., %s, %s}" % (r1rho_prime, phi_ex, kex),
+ "{%s, ..., pA, %s, %s}" % (r1rho_prime, dw, kex),
+ "{%s, ..., %s, %s}" % (r1rho_prime, phi_ex, kex),
+ "{%s, ..., pA, %s, %s}" % (r1rho_prime, dw, kex),
+ "{%s, ..., pA, %s, %s}" % (r1rho_prime, dw, kex)
]
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/lib/text/gui.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/text/gui.py?rev=20921&r1=20920&r2=20921&view=diff
==============================================================================
--- branches/relax_disp/lib/text/gui.py (original)
+++ branches/relax_disp/lib/text/gui.py Fri Sep 6 19:30:06 2013
@@ -56,3 +56,25 @@
local_tm = u("local \u03C4m")
tm = u("\u03C4m")
rex = "Rex"
+
+# Relaxation dispersion GUI text elements.
+dw = u("d\u03C9")
+i0 = u("I\u2080")
+kex = u("k\u2091\u2093")
+padw2 = u("pA.d\u03C9\u00B2")
+phi_ex = u("\u03D5\u2091\u2093")
+phi_exB = u("\u03D5\u2091\u2093B")
+phi_exC = u("\u03D5\u2091\u2093C")
+r1rho = u("R\u2081\u1D68")
+r1rho_prime = u("R\u2081\u1D68'")
+r2a = u("R\u2082A")
+r2b = u("R\u2082B")
+r2eff = u("R\u2082eff")
+if win:
+ i0 = "I0"
+ kex = "kex"
+ r1rho = "R1rho"
+ r1rho_prime = "R1rho'"
+ r2a = "R2A"
+ r2b = "R2B"
+ r2eff = "R2eff"
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=20921&r1=20920&r2=20921&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_disp.py (original)
+++ branches/relax_disp/user_functions/relax_disp.py Fri Sep 6 19:30:06 2013
@@ -32,10 +32,10 @@
FD_SAVE = -1
# relax module imports.
-from compat import u
+from lib.text.gui import dw, i0, kex, padw2, phi_ex, phi_exB, phi_exC,
r1rho, r1rho_prime, r2, r2a, r2b, r2eff
+from graphics import ANALYSIS_IMAGE_PATH, WIZARD_IMAGE_PATH
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
from specific_analyses.relax_disp.cpmgfit import cpmgfit_execute,
cpmgfit_input
from specific_analyses.relax_disp.disp_data import cpmg_frq, exp_type,
plot_disp_curves, plot_exp_curves, relax_time, spin_lock_field,
spin_lock_offset
from specific_analyses.relax_disp.nessy import nessy_input
@@ -244,7 +244,7 @@
wiz_element_type = "combo",
wiz_combo_choices = [
"CPMG",
- u("R\u2081\u1D68")
+ r1rho
],
wiz_combo_data = [
"CPMG",
@@ -462,24 +462,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, k_AB}") % 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
+ "%s: {%s/%s, %s}" % (MODEL_R2EFF, r2eff, r1rho, i0),
+ "%s: {%s, ...}" % (MODEL_NOREX, r2),
+ "%s: {%s, ..., %s, %s}" % (MODEL_LM63, r2, phi_ex, kex),
+ "%s: {%s, ..., %s, kB, %s, kC}" % (MODEL_LM63_3SITE, r2, phi_exB,
phi_exC),
+ "%s: {%s, ..., pA, %s, %s}" % (MODEL_CR72, r2, dw, kex),
+ "%s: {%s, %s, ..., pA, %s, %s}" % (MODEL_CR72_FULL, r2a, r2b, dw,
kex),
+ "%s: {%s, ..., %s, %s, %s}" % (MODEL_IT99, r2, phi_ex, padw2, kex),
+ "%s: {%s, ..., %s, k_AB}" % (MODEL_TSMFK01, r2a, dw),
+ "%s: {%s, ..., pA, %s, %s}" % (MODEL_NS_CPMG_2SITE_3D, r2, dw, kex),
+ "%s: {%s, %s, ..., pA, %s, %s}" % (MODEL_NS_CPMG_2SITE_3D_FULL, r2a,
r2b, dw, kex),
+ "%s: {%s, ..., pA, %s, %s}" % (MODEL_NS_CPMG_2SITE_STAR, r2, dw,
kex),
+ "%s: {%s, %s, ..., pA, %s, %s}" % (MODEL_NS_CPMG_2SITE_STAR_FULL,
r2a, r2b, dw, kex),
+ "%s: {%s, ..., pA, %s, %s}" % (MODEL_NS_CPMG_2SITE_EXPANDED, r2, dw,
kex),
+ "%s: {%s, ..., %s, %s}" % (MODEL_M61, r1rho_prime, phi_ex, kex),
+ "%s: {%s, ..., pA, %s, %s}" % (MODEL_M61B, r1rho_prime, dw, kex),
+ "%s: {%s, ..., %s, %s}" % (MODEL_DPL94, r1rho_prime, phi_ex, kex),
+ "%s: {%s, ..., pA, %s, %s}" % (MODEL_TP02, r1rho_prime, dw, kex),
+ "%s: {%s, ..., pA, %s, %s}" % (MODEL_NS_R1RHO_2SITE, r1rho_prime,
dw, kex)
],
wiz_combo_data = [
MODEL_R2EFF,
r20921 - in /branches/relax_disp: gui/analyses/auto_relax_disp.py lib/text/gui.py user_functions/relax_disp.py