r19577 - in /trunk/gui/analyses: auto_r1.py auto_r2.py auto_rx_base.py -- April 22, 2013 - 00:50

Author: bugman
Date: Mon Apr 22 00:50:13 2013
New Revision: 19577

URL: http://svn.gna.org/viewcvs/relax?rev=19577&view=rev
Log:
Fixes for the R1 and R2 GUI analyses for the recently introduced unicode 
subscript characters.

There is now self.label for a pure string version and self.gui_label for the 
fancier unicode version.


Modified:
    trunk/gui/analyses/auto_r1.py
    trunk/gui/analyses/auto_r2.py
    trunk/gui/analyses/auto_rx_base.py

Modified: trunk/gui/analyses/auto_r1.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_r1.py?rev=19577&r1=19576&r2=19577&view=diff
==============================================================================
--- trunk/gui/analyses/auto_r1.py (original)
+++ trunk/gui/analyses/auto_r1.py Mon Apr 22 00:50:13 2013
@@ -34,4 +34,5 @@
     analysis_type = 'r1'
     bitmap = [ANALYSIS_IMAGE_PATH+"r1_200x200.png",
               IMAGE_PATH+'r1.png']
-    label = u"R\u2081"
+    label = "R1"
+    gui_label = u"R\u2081"

Modified: trunk/gui/analyses/auto_r2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_r2.py?rev=19577&r1=19576&r2=19577&view=diff
==============================================================================
--- trunk/gui/analyses/auto_r2.py (original)
+++ trunk/gui/analyses/auto_r2.py Mon Apr 22 00:50:13 2013
@@ -34,4 +34,5 @@
     analysis_type = 'r2'
     bitmap = [ANALYSIS_IMAGE_PATH+"r2_200x200.png",
               IMAGE_PATH+'r2.png']
-    label = u"R\u2082"
+    label = "R2"
+    gui_label = u"R\u2082"

Modified: trunk/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_rx_base.py?rev=19577&r1=19576&r2=19577&view=diff
==============================================================================
--- trunk/gui/analyses/auto_rx_base.py (original)
+++ trunk/gui/analyses/auto_rx_base.py Mon Apr 22 00:50:13 2013
@@ -199,13 +199,13 @@
         box = wx.BoxSizer(wx.VERTICAL)
 
         # Add the frame title.
-        self.add_title(box, "Setup for %s relaxation analysis" % self.label)
+        self.add_title(box, "Setup for %s relaxation analysis" % 
self.gui_label)
 
         # Display the data pipe.
         Text_ctrl(box, self, text="The data pipe bundle:", 
default=self.data.pipe_bundle, tooltip="This is the data pipe bundle 
associated with this analysis.", editable=False, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the frequency selection GUI element.
-        self.field_nmr_frq = Text_ctrl(box, self, text="NMR frequency label 
[MHz]:", default=self.data.frq, tooltip="This label is added to the output 
files.  For example if the label is '600', the %s values will be located in 
the file '%s.600.out'." % (self.label, self.label.lower()), 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
+        self.field_nmr_frq = Text_ctrl(box, self, text="NMR frequency label 
[MHz]:", default=self.data.frq, tooltip="This label is added to the output 
files.  For example if the label is '600', the %s values will be located in 
the file '%s.600.out'." % (self.gui_label, self.label.lower()), 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
 
         # Add the results directory GUI element.
         self.field_results_dir = Text_ctrl(box, self, text="Results 
directory:", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
tooltip="The directory in which all automatically created files will be 
saved.", tooltip_button="Select the results directory.", 
fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)