Author: bugman
Date: Fri Sep 6 18:44:56 2013
New Revision: 20917
URL: http://svn.gna.org/viewcvs/relax?rev=20917&view=rev
Log:
Converted the model-free user function definitions to use the new gui.text
module strings.
Modified:
trunk/user_functions/model_free.py
Modified: trunk/user_functions/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/model_free.py?rev=20917&r1=20916&r2=20917&view=diff
==============================================================================
--- trunk/user_functions/model_free.py (original)
+++ trunk/user_functions/model_free.py Fri Sep 6 18:44:56 2013
@@ -26,8 +26,8 @@
from os import sep
# relax module imports.
-from compat import u
from graphics import ANALYSIS_IMAGE_PATH
+from gui import text
from specific_analyses.setup import model_free_obj
from user_functions.data import Uf_info; uf_info = Uf_info()
from user_functions.objects import Desc_container
@@ -215,93 +215,93 @@
desc = "The name of the preset model.",
wiz_element_type = "combo",
wiz_combo_choices = [
- u("m0: {}"),
- u("m1: {S\u00B2}"),
- u("m2: {S\u00B2, \u03C4e}"),
- u("m3: {S\u00B2, Rex}"),
- u("m4: {S\u00B2, \u03C4e, Rex}"),
- u("m5: {S\u00B2f, S\u00B2, \u03C4s}"),
- u("m6: {S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
- u("m7: {S\u00B2f, S\u00B2, \u03C4s, Rex}"),
- u("m8: {S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
- u("m9: {Rex}"),
- u(""),
- 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}"),
- u("m12: {CSA, S\u00B2, \u03C4e}"),
- u("m13: {CSA, S\u00B2, Rex}"),
- u("m14: {CSA, S\u00B2, \u03C4e, Rex}"),
- u("m15: {CSA, S\u00B2f, S\u00B2, \u03C4s}"),
- u("m16: {CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
- u("m17: {CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
- u("m18: {CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
- u("m19: {CSA, Rex}"),
- u(""),
- 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}"),
- u("m22: {r, S\u00B2, \u03C4e}"),
- u("m23: {r, S\u00B2, Rex}"),
- u("m24: {r, S\u00B2, \u03C4e, Rex}"),
- u("m25: {r, S\u00B2f, S\u00B2, \u03C4s}"),
- u("m26: {r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
- u("m27: {r, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
- u("m28: {r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
- u("m29: {r, CSA, Rex}"),
- u(""),
- 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}"),
- u("m32: {r, CSA, S\u00B2, \u03C4e}"),
- u("m33: {r, CSA, S\u00B2, Rex}"),
- u("m34: {r, CSA, S\u00B2, \u03C4e, Rex}"),
- u("m35: {r, CSA, S\u00B2f, S\u00B2, \u03C4s}"),
- u("m36: {r, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}"),
- u("m37: {r, CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}"),
- u("m38: {r, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}"),
- u("m39: {r, CSA, Rex}"),
- u(""),
- 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}")
+ "m0: {}",
+ "m1: {%s}" % text.s2,
+ "m2: {%s, %s}" % (text.s2, text.te),
+ "m3: {%s, %s}" % (text.s2, text.rex),
+ "m4: {%s, %s, %s}" % (text.s2, text.te, text.rex),
+ "m5: {%s, %s, %s}" % (text.s2, text.s2f, text.ts),
+ "m6: {%s, %s, %s, %s}" % (text.s2, text.tf, text.s2f, text.ts),
+ "m7: {%s, %s, %s, %s}" % (text.s2, text.s2f, text.ts, text.rex),
+ "m8: {%s, %s, %s, %s, %s}" % (text.s2, text.tf, text.s2f, text.ts,
text.rex),
+ "m9: {%s}" % text.rex,
+ "",
+ "tm0: {%s}" % text.local_tm,
+ "tm1: {%s, %s}" % (text.local_tm, text.s2),
+ "tm2: {%s, %s, %s}" % (text.local_tm, text.s2, text.te),
+ "tm3: {%s, %s, %s}" % (text.local_tm, text.s2, text.rex),
+ "tm4: {%s, %s, %s, %s}" % (text.local_tm, text.s2, text.te,
text.rex),
+ "tm5: {%s, %s, %s, %s}" % (text.local_tm, text.s2, text.s2f,
text.ts),
+ "tm6: {%s, %s, %s, %s, %s}" % (text.local_tm, text.s2, text.tf,
text.s2f, text.ts),
+ "tm7: {%s, %s, %s, %s, %s}" % (text.local_tm, text.s2, text.s2f,
text.ts, text.rex),
+ "tm8: {%s, %s, %s, %s, %s, %s}" % (text.local_tm, text.s2, text.tf,
text.s2f, text.ts, text.rex),
+ "tm9: {%s, %s}" % (text.local_tm, text.rex),
+ "",
+ "m10: {%s}" % text.csa,
+ "m11: {%s, %s}" % (text.csa, text.s2),
+ "m12: {%s, %s, %s}" % (text.csa, text.s2, text.te),
+ "m13: {%s, %s, %s}" % (text.csa, text.s2, text.rex),
+ "m14: {%s, %s, %s, %s}" % (text.csa, text.s2, text.te, text.rex),
+ "m15: {%s, %s, %s, %s}" % (text.csa, text.s2, text.s2f, text.ts),
+ "m16: {%s, %s, %s, %s, %s}" % (text.csa, text.s2, text.tf,
text.s2f, text.ts),
+ "m17: {%s, %s, %s, %s, %s}" % (text.csa, text.s2, text.s2f,
text.ts, text.rex),
+ "m18: {%s, %s, %s, %s, %s, %s}" % (text.csa, text.s2, text.tf,
text.s2f, text.ts, text.rex),
+ "m19: {%s, %s}" % (text.csa, text.rex),
+ "",
+ "tm10: {%s, %s}" % (text.local_tm, text.csa),
+ "tm11: {%s, %s, %s}" % (text.local_tm, text.csa, text.s2),
+ "tm12: {%s, %s, %s, %s}" % (text.local_tm, text.csa, text.s2,
text.te),
+ "tm13: {%s, %s, %s, %s}" % (text.local_tm, text.csa, text.s2,
text.rex),
+ "tm14: {%s, %s, %s, %s, %s}" % (text.local_tm, text.csa, text.s2,
text.te, text.rex),
+ "tm15: {%s, %s, %s, %s, %s}" % (text.local_tm, text.csa, text.s2,
text.s2f, text.ts),
+ "tm16: {%s, %s, %s, %s, %s, %s}" % (text.local_tm, text.csa,
text.s2, text.tf, text.s2f, text.ts),
+ "tm17: {%s, %s, %s, %s, %s, %s}" % (text.local_tm, text.csa,
text.s2, text.s2f, text.ts, text.rex),
+ "tm18: {%s, %s, %s, %s, %s, %s, %s}" % (text.local_tm, text.csa,
text.s2, text.tf, text.s2f, text.ts, text.rex),
+ "tm19: {%s, %s, %s}" % (text.local_tm, text.csa, text.rex),
+ "",
+ "m20: {%s}" % text.r,
+ "m21: {%s, %s}" % (text.r, text.s2),
+ "m22: {%s, %s, %s}" % (text.r, text.s2, text.te),
+ "m23: {%s, %s, %s}" % (text.r, text.s2, text.rex),
+ "m24: {%s, %s, %s, %s}" % (text.r, text.s2, text.te, text.rex),
+ "m25: {%s, %s, %s, %s}" % (text.r, text.s2, text.s2f, text.ts),
+ "m26: {%s, %s, %s, %s, %s}" % (text.r, text.s2, text.tf, text.s2f,
text.ts),
+ "m27: {%s, %s, %s, %s, %s}" % (text.r, text.s2, text.s2f, text.ts,
text.rex),
+ "m28: {%s, %s, %s, %s, %s, %s}" % (text.r, text.s2, text.tf,
text.s2f, text.ts, text.rex),
+ "m29: {%s, %s}" % (text.r, text.rex),
+ "",
+ "tm20: {%s, %s}" % (text.local_tm, text.r),
+ "tm21: {%s, %s, %s}" % (text.local_tm, text.r, text.s2),
+ "tm22: {%s, %s, %s, %s}" % (text.local_tm, text.r, text.s2,
text.te),
+ "tm23: {%s, %s, %s, %s}" % (text.local_tm, text.r, text.s2,
text.rex),
+ "tm24: {%s, %s, %s, %s, %s}" % (text.local_tm, text.r, text.s2,
text.te, text.rex),
+ "tm25: {%s, %s, %s, %s, %s}" % (text.local_tm, text.r, text.s2,
text.s2f, text.ts),
+ "tm26: {%s, %s, %s, %s, %s, %s}" % (text.local_tm, text.r, text.s2,
text.tf, text.s2f, text.ts),
+ "tm27: {%s, %s, %s, %s, %s, %s}" % (text.local_tm, text.r, text.s2,
text.s2f, text.ts, text.rex),
+ "tm28: {%s, %s, %s, %s, %s, %s, %s}" % (text.local_tm, text.r,
text.s2, text.tf, text.s2f, text.ts, text.rex),
+ "tm29: {%s, %s, %s}" % (text.local_tm, text.r, text.rex),
+ "",
+ "m30: {%s, %s}" % (text.r, text.csa),
+ "m31: {%s, %s, %s}" % (text.r, text.csa, text.s2),
+ "m32: {%s, %s, %s, %s}" % (text.r, text.csa, text.s2, text.te),
+ "m33: {%s, %s, %s, %s}" % (text.r, text.csa, text.s2, text.rex),
+ "m34: {%s, %s, %s, %s, %s}" % (text.r, text.csa, text.s2, text.te,
text.rex),
+ "m35: {%s, %s, %s, %s, %s}" % (text.r, text.csa, text.s2, text.s2f,
text.ts),
+ "m36: {%s, %s, %s, %s, %s, %s}" % (text.r, text.csa, text.s2,
text.tf, text.s2f, text.ts),
+ "m37: {%s, %s, %s, %s, %s, %s}" % (text.r, text.csa, text.s2,
text.s2f, text.ts, text.rex),
+ "m38: {%s, %s, %s, %s, %s, %s, %s}" % (text.r, text.csa, text.s2,
text.tf, text.s2f, text.ts, text.rex),
+ "m39: {%s, %s, %s}" % (text.r, text.csa, text.rex),
+ "",
+ "tm30: {%s, %s, %s}" % (text.local_tm, text.r, text.csa),
+ "tm31: {%s, %s, %s, %s}" % (text.local_tm, text.r, text.csa,
text.s2),
+ "tm32: {%s, %s, %s, %s, %s}" % (text.local_tm, text.r, text.csa,
text.s2, text.te),
+ "tm33: {%s, %s, %s, %s, %s}" % (text.local_tm, text.r, text.csa,
text.s2, text.rex),
+ "tm34: {%s, %s, %s, %s, %s, %s}" % (text.local_tm, text.r,
text.csa, text.s2, text.te, text.rex),
+ "tm35: {%s, %s, %s, %s, %s, %s}" % (text.local_tm, text.r,
text.csa, text.s2, text.s2f, text.ts),
+ "tm36: {%s, %s, %s, %s, %s, %s, %s}" % (text.local_tm, text.r,
text.csa, text.s2, text.tf, text.s2f, text.ts),
+ "tm37: {%s, %s, %s, %s, %s, %s, %s}" % (text.local_tm, text.r,
text.csa, text.s2, text.s2f, text.ts, text.rex),
+ "tm38: {%s, %s, %s, %s, %s, %s, %s, %s}" % (text.local_tm, text.r,
text.csa, text.s2, text.tf, text.s2f, text.ts, text.rex),
+ "tm39: {%s, %s, %s, %s}" % (text.local_tm, text.r, text.csa,
text.rex)
],
wiz_combo_data = [
"m0",
r20917 - /trunk/user_functions/model_free.py