r26847 - in /trunk: lib/text/gui.py user_functions/relax_fit.py -- November 29, 2014 - 17:51

Author: bugman
Date: Sat Nov 29 17:51:35 2014
New Revision: 26847

URL: http://svn.gna.org/viewcvs/relax?rev=26847&view=rev
Log:
Improvement for the relax_fit.select_model user function in the GUI.

Unicode text is now being used to display the parameters as R_x and I_0 and 
to show an infinity
symbol in the Iinf parameter.  The Rx and Iinf parameters have been added to 
lib.text.gui to allow
this.


Modified:
    trunk/lib/text/gui.py
    trunk/user_functions/relax_fit.py

Modified: trunk/lib/text/gui.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/text/gui.py?rev=26847&r1=26846&r2=26847&view=diff
==============================================================================
--- trunk/lib/text/gui.py       (original)
+++ trunk/lib/text/gui.py       Sat Nov 29 17:51:35 2014
@@ -40,9 +40,13 @@
 # Relaxation data GUI text elements.
 r1 = u("R\u2081")
 r2 = u("R\u2082")
+rx = u("R\u2093")
+iinf = u("I\u221E")
 if win:
     r1 = "R1"
     r2 = "R2"
+    rx = "Rx"
+    iinf = "Iinf"
 
 # Model-free GUI text elements.
 s2 = u("S\u00B2")

Modified: trunk/user_functions/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/relax_fit.py?rev=26847&r1=26846&r2=26847&view=diff
==============================================================================
--- trunk/user_functions/relax_fit.py   (original)
+++ trunk/user_functions/relax_fit.py   Sat Nov 29 17:51:35 2014
@@ -28,6 +28,7 @@
 
 # relax module imports.
 from graphics import ANALYSIS_IMAGE_PATH
+from lib.text.gui import i0, iinf, rx
 from pipe_control import spectrum
 from specific_analyses.relax_fit.uf import relax_time, select_model
 from user_functions.data import Uf_info; uf_info = Uf_info()
@@ -84,9 +85,9 @@
     desc = "The type of relaxation curve to fit.",
     wiz_element_type = "combo",
     wiz_combo_choices = [
-        "Two parameter exponential fit: [Rx, I0]",
-        "Inversion recovery: [Rx, I0, Iinf]",
-        "Saturation recovery: [Rx, Iinf]"
+        "Two parameter exponential fit: [%s, %s]" % (rx, i0),
+        "Inversion recovery: [%s, %s, %s]" % (rx, i0, iinf),
+        "Saturation recovery: [%s, %s]" % (rx, iinf)
     ],
     wiz_combo_data = [
         "exp",