Author: bugman
Date: Wed Sep 4 10:52:10 2013
New Revision: 20793
URL: http://svn.gna.org/viewcvs/relax?rev=20793&view=rev
Log:
All "local tm" text in the GUI now uses a subscript m unicode character as
well as the tau character.
Modified:
trunk/gui/analyses/auto_model_free.py
trunk/user_functions/model_free.py
Modified: trunk/gui/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_model_free.py?rev=20793&r1=20792&r2=20793&view=diff
==============================================================================
--- trunk/gui/analyses/auto_model_free.py (original)
+++ trunk/gui/analyses/auto_model_free.py Wed Sep 4 10:52:10 2013
@@ -815,7 +815,7 @@
"""The local model-free model list GUI element."""
# Some class variables.
- desc = u("Local \u03C4m models:")
+ desc = u("Local \u03C4\u2098 models:")
models = [
"tm0",
"tm1",
@@ -829,20 +829,20 @@
"tm9"
]
params = [
- u("{local \u03C4m}"),
- u("{local \u03C4m, S\u00B2}"),
- u("{local \u03C4m, S\u00B2, \u03C4e}"),
- u("{local \u03C4m, S\u00B2, Rex}"),
- u("{local \u03C4m, S\u00B2, \u03C4e, Rex}"),
- u("{local \u03C4m, S\u00B2, S\u00B2f, \u03C4s}"),
- u("{local \u03C4m, S\u00B2, \u03C4f, S\u00B2f, \u03C4s}"),
- u("{local \u03C4m, S\u00B2, S\u00B2f, \u03C4s, Rex}"),
- u("{local \u03C4m, S\u00B2, \u03C4f, S\u00B2f, \u03C4s, Rex}"),
- u("{local \u03C4m, Rex}")
+ u("{local \u03C4\u2098}"),
+ u("{local \u03C4\u2098, S\u00B2}"),
+ u("{local \u03C4\u2098, S\u00B2, \u03C4e}"),
+ u("{local \u03C4\u2098, S\u00B2, Rex}"),
+ u("{local \u03C4\u2098, S\u00B2, \u03C4e, Rex}"),
+ u("{local \u03C4\u2098, S\u00B2, S\u00B2f, \u03C4s}"),
+ u("{local \u03C4\u2098, S\u00B2, \u03C4f, S\u00B2f, \u03C4s}"),
+ u("{local \u03C4\u2098, S\u00B2, S\u00B2f, \u03C4s, Rex}"),
+ u("{local \u03C4\u2098, S\u00B2, \u03C4f, S\u00B2f, \u03C4s, Rex}"),
+ u("{local \u03C4\u2098, 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
- tooltip = u("The list model-free models with the local \u03C4m parameter
to optimise as the first step of the protocol (see the about window for
details). This really should not be changed.")
+ tooltip = u("The list model-free models with the local \u03C4\u2098
parameter to optimise as the first step of the protocol (see the about window
for details). This really should not be changed.")
tooltip_button = "Open the model list selector window."
@@ -973,8 +973,8 @@
sub_sizer.AddSpacer(10)
# The local_tm button.
- button = wx.Button(self, -1, u("Local \u03C4m"))
- button.SetToolTipString(u("Optimise global model I, the local
\u03C4m models. Please click on the 'About' button for more information."))
+ button = wx.Button(self, -1, u("Local \u03C4\u2098"))
+ button.SetToolTipString(u("Optimise global model I, the local
\u03C4\u2098 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/user_functions/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/model_free.py?rev=20793&r1=20792&r2=20793&view=diff
==============================================================================
--- trunk/user_functions/model_free.py (original)
+++ trunk/user_functions/model_free.py Wed Sep 4 10:52:10 2013
@@ -226,16 +226,16 @@
u("m8: {S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
u("m9: {Rex}"),
u(""),
- u("tm0: {\u03C4m}"),
- u("tm1: {\u03C4m, S\u00B2}"),
- u("tm2: {\u03C4m, S\u00B2, \u03C4e}"),
- u("tm3: {\u03C4m, S\u00B2, Rex}"),
- u("tm4: {\u03C4m, S\u00B2, \u03C4e, Rex}"),
- u("tm5: {\u03C4m, S\u00B2f, S\u00B2, \u03C4s}"),
- u("tm6: {\u03C4m, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
- u("tm7: {\u03C4m, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
- u("tm8: {\u03C4m, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
- u("tm9: {\u03C4m, Rex}"),
+ u("tm0: {\u03C4\u2098}"),
+ u("tm1: {\u03C4\u2098, S\u00B2}"),
+ u("tm2: {\u03C4\u2098, S\u00B2, \u03C4e}"),
+ u("tm3: {\u03C4\u2098, S\u00B2, Rex}"),
+ u("tm4: {\u03C4\u2098, S\u00B2, \u03C4e, Rex}"),
+ u("tm5: {\u03C4\u2098, S\u00B2f, S\u00B2, \u03C4s}"),
+ u("tm6: {\u03C4\u2098, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
+ u("tm7: {\u03C4\u2098, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
+ u("tm8: {\u03C4\u2098, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
+ u("tm9: {\u03C4\u2098, Rex}"),
u(""),
u("m10: {CSA}"),
u("m11: {CSA, S\u00B2}"),
@@ -248,16 +248,16 @@
u("m18: {CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
u("m19: {CSA, Rex}"),
u(""),
- u("tm10: {\u03C4m, CSA}"),
- u("tm11: {\u03C4m, CSA, S\u00B2}"),
- u("tm12: {\u03C4m, CSA, S\u00B2, \u03C4e}"),
- u("tm13: {\u03C4m, CSA, S\u00B2, Rex}"),
- u("tm14: {\u03C4m, CSA, S\u00B2, \u03C4e, Rex}"),
- u("tm15: {\u03C4m, CSA, S\u00B2f, S\u00B2, \u03C4s}"),
- u("tm16: {\u03C4m, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
- u("tm17: {\u03C4m, CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
- u("tm18: {\u03C4m, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
- u("tm19: {\u03C4m, CSA, Rex}"),
+ u("tm10: {\u03C4\u2098, CSA}"),
+ u("tm11: {\u03C4\u2098, CSA, S\u00B2}"),
+ u("tm12: {\u03C4\u2098, CSA, S\u00B2, \u03C4e}"),
+ u("tm13: {\u03C4\u2098, CSA, S\u00B2, Rex}"),
+ u("tm14: {\u03C4\u2098, CSA, S\u00B2, \u03C4e, Rex}"),
+ u("tm15: {\u03C4\u2098, CSA, S\u00B2f, S\u00B2, \u03C4s}"),
+ u("tm16: {\u03C4\u2098, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
+ u("tm17: {\u03C4\u2098, CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
+ u("tm18: {\u03C4\u2098, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s,
Rex}"),
+ u("tm19: {\u03C4\u2098, CSA, Rex}"),
u(""),
u("m20: {r}"),
u("m21: {r, S\u00B2}"),
@@ -270,16 +270,16 @@
u("m28: {r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
u("m29: {r, CSA, Rex}"),
u(""),
- u("tm20: {\u03C4m, r}"),
- u("tm21: {\u03C4m, r, S\u00B2}"),
- u("tm22: {\u03C4m, r, S\u00B2, \u03C4e}"),
- u("tm23: {\u03C4m, r, S\u00B2, Rex}"),
- u("tm24: {\u03C4m, r, S\u00B2, \u03C4e, Rex}"),
- u("tm25: {\u03C4m, r, S\u00B2f, S\u00B2, \u03C4s}"),
- u("tm26: {\u03C4m, r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
- u("tm27: {\u03C4m, r, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
- u("tm28: {\u03C4m, r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
- u("tm29: {\u03C4m, r, CSA, Rex}"),
+ u("tm20: {\u03C4\u2098, r}"),
+ u("tm21: {\u03C4\u2098, r, S\u00B2}"),
+ u("tm22: {\u03C4\u2098, r, S\u00B2, \u03C4e}"),
+ u("tm23: {\u03C4\u2098, r, S\u00B2, Rex}"),
+ u("tm24: {\u03C4\u2098, r, S\u00B2, \u03C4e, Rex}"),
+ u("tm25: {\u03C4\u2098, r, S\u00B2f, S\u00B2, \u03C4s}"),
+ u("tm26: {\u03C4\u2098, r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
+ u("tm27: {\u03C4\u2098, r, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
+ u("tm28: {\u03C4\u2098, r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s,
Rex}"),
+ u("tm29: {\u03C4\u2098, r, CSA, Rex}"),
u(""),
u("m30: {r, CSA}"),
u("m31: {r, CSA, S\u00B2}"),
@@ -292,16 +292,16 @@
u("m38: {r, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
u("m39: {r, CSA, Rex}"),
u(""),
- u("tm30: {\u03C4m, r, CSA}"),
- u("tm31: {\u03C4m, r, CSA, S\u00B2}"),
- u("tm32: {\u03C4m, r, CSA, S\u00B2, \u03C4e}"),
- u("tm33: {\u03C4m, r, CSA, S\u00B2, Rex}"),
- u("tm34: {\u03C4m, r, CSA, S\u00B2, \u03C4e, Rex}"),
- u("tm35: {\u03C4m, r, CSA, S\u00B2f, S\u00B2, \u03C4s}"),
- u("tm36: {\u03C4m, r, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
- u("tm37: {\u03C4m, r, CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
- u("tm38: {\u03C4m, r, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s,
Rex}"),
- u("tm39: {\u03C4m, r, CSA, Rex}")
+ u("tm30: {\u03C4\u2098, r, CSA}"),
+ u("tm31: {\u03C4\u2098, r, CSA, S\u00B2}"),
+ u("tm32: {\u03C4\u2098, r, CSA, S\u00B2, \u03C4e}"),
+ u("tm33: {\u03C4\u2098, r, CSA, S\u00B2, Rex}"),
+ u("tm34: {\u03C4\u2098, r, CSA, S\u00B2, \u03C4e, Rex}"),
+ u("tm35: {\u03C4\u2098, r, CSA, S\u00B2f, S\u00B2, \u03C4s}"),
+ u("tm36: {\u03C4\u2098, r, CSA, S\u00B2f, \u03C4f, S\u00B2,
\u03C4s}"),
+ u("tm37: {\u03C4\u2098, r, CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
+ u("tm38: {\u03C4\u2098, r, CSA, S\u00B2f, \u03C4f, S\u00B2,
\u03C4s, Rex}"),
+ u("tm39: {\u03C4\u2098, r, CSA, Rex}")
],
wiz_combo_data = [
"m0",
r20793 - in /trunk: gui/analyses/auto_model_free.py user_functions/model_free.py