r10578 - /branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py -- January 29, 2010 - 11:46

Author: bugman
Date: Fri Jan 29 11:46:00 2010
New Revision: 10578

URL: http://svn.gna.org/viewcvs/relax?rev=10578&view=rev
Log:
Variable abstraction.

The following GUI elements were renamed:
    r1_list -> field_rx_list
    r1_time -> field_rx_time


Modified:
    branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py

Modified: branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py?rev=10578&r1=10577&r2=10578&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py Fri Jan 29 11:46:00 
2010
@@ -338,17 +338,17 @@
         sizer_grid.Add(label, 0, wx.ADJUST_MINSIZE, 0)
 
         # Build the grid of file names and relaxation times.
-        self.r1_list = []
-        self.r1_time = []
+        self.field_rx_list = []
+        self.field_rx_time = []
         for i in range(1, self.peak_list_count+1):
             # The peak list file name GUI elements.
-            self.r1_list.append(wx.StaticText(panel_grid, -1, ""))
-            sizer_grid.Add(self.r1_list[-1], 0, wx.ADJUST_MINSIZE, 0)
+            self.field_rx_list.append(wx.StaticText(panel_grid, -1, ""))
+            sizer_grid.Add(self.field_rx_list[-1], 0, wx.ADJUST_MINSIZE, 0)
 
             # The time GUI elements.
-            self.r1_time.append(wx.TextCtrl(panel_grid, -1, ""))
-            self.r1_time[-1].SetMinSize((80, 20))
-            sizer_grid.Add(self.r1_time[-1], 0, wx.ADJUST_MINSIZE, 0)
+            self.field_rx_time.append(wx.TextCtrl(panel_grid, -1, ""))
+            self.field_rx_time[-1].SetMinSize((80, 20))
+            sizer_grid.Add(self.field_rx_time[-1], 0, wx.ADJUST_MINSIZE, 0)
 
         # Place the grid inside the panel.
         panel_grid.SetSizer(sizer_grid)
@@ -640,15 +640,12 @@
         # The peak lists and relaxation times.
         if upload:
             for i in range(self.peak_list_count):
-                # The file name.
-                self.data.file_list[i] = str(self.r1_list[i])
-
-                # The relaxation time.
-                self.data.relax_times[i] = str(self.r1_time[i].GetValue())
+                # Set the relaxation time.
+                self.data.relax_times[i] = self.field_rx_time[i].GetValue()
         else:
             for i in range(self.peak_list_count):
                 # The file name.
-                self.r1_list[i] = str(self.data.file_list[i])
+                self.field_rx_list[i].SetLabel(self.data.file_list[i])
 
                 # The relaxation time.
-                self.r1_time[i].SetValue(str(self.data.file_list[i]))
+                self.field_rx_time[i].SetValue(str(self.data.relax_times[i]))