r16402 - in /branches/uf_redesign: data/gui.py gui/components/free_file_format.py -- May 22, 2012 - 18:04

Author: bugman
Date: Tue May 22 18:04:17 2012
New Revision: 16402

URL: http://svn.gna.org/viewcvs/relax?rev=16402&view=rev
Log:
Fix for the free file format error column.

In a number of places it was being referred to as 'err_col' rather than 
'error_col'.  This is due to
legacy GUI code.


Modified:
    branches/uf_redesign/data/gui.py
    branches/uf_redesign/gui/components/free_file_format.py

Modified: branches/uf_redesign/data/gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/data/gui.py?rev=16402&r1=16401&r2=16402&view=diff
==============================================================================
--- branches/uf_redesign/data/gui.py (original)
+++ branches/uf_redesign/data/gui.py Tue May 22 18:04:17 2012
@@ -149,7 +149,7 @@
         self.spin_num_col =  4
         self.spin_name_col = 5
         self.data_col =      6
-        self.err_col =       7
+        self.error_col =     7
 
         # The column separator (set to None for white space).
         self.sep = None

Modified: branches/uf_redesign/gui/components/free_file_format.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/components/free_file_format.py?rev=16402&r1=16401&r2=16402&view=diff
==============================================================================
--- branches/uf_redesign/gui/components/free_file_format.py (original)
+++ branches/uf_redesign/gui/components/free_file_format.py Tue May 22 
18:04:17 2012
@@ -100,7 +100,7 @@
         self.spin_name_col = Value(name='spin_name_col', parent=self.parent, 
value_type='int', sizer=field_sizer, desc="Spin name column:", 
divider=divider, padding=padding, spacer=spacer, can_be_none=True)
         if data_cols:
             self.data_col = Value(name='data_col', parent=self.parent, 
value_type='int', sizer=field_sizer, desc="Data column:", divider=divider, 
padding=padding, spacer=spacer, can_be_none=True)
-            self.err_col = Value(name='err_col', parent=self.parent, 
value_type='int', sizer=field_sizer, desc="Error column:", divider=divider, 
padding=padding, spacer=spacer, can_be_none=True)
+            self.error_col = Value(name='error_col', parent=self.parent, 
value_type='int', sizer=field_sizer, desc="Error column:", divider=divider, 
padding=padding, spacer=spacer, can_be_none=True)
 
         # The column separator.
         self.sep = Value(name='sep', parent=self.parent, 
element_type='combo', value_type='str', sizer=field_sizer, desc="Column 
separator:", combo_choices=["white space", ",", ";", ":", ""], 
divider=divider, padding=padding, spacer=spacer, read_only=False, 
can_be_none=True)
@@ -170,8 +170,8 @@
         settings['spin_name_col'] = gui_to_int(self.spin_name_col.GetValue())
         if hasattr(self, 'data_col'):
             settings['data_col'] =  gui_to_int(self.data_col.GetValue())
-        if hasattr(self, 'err_col'):
-            settings['error_col'] = gui_to_int(self.err_col.GetValue())
+        if hasattr(self, 'error_col'):
+            settings['error_col'] = gui_to_int(self.error_col.GetValue())
 
         # The column separator.
         settings['sep'] = str(self.sep.GetValue())
@@ -240,8 +240,8 @@
         # The data and error.
         if hasattr(self, 'data_col'):
             ds.relax_gui.free_file_format.data_col = 
gui_to_int(self.data_col.GetValue())
-        if hasattr(self, 'err_col'):
-            ds.relax_gui.free_file_format.err_col = 
gui_to_int(self.err_col.GetValue())
+        if hasattr(self, 'error_col'):
+            ds.relax_gui.free_file_format.error_col = 
gui_to_int(self.error_col.GetValue())
 
         # The column separator.
         ds.relax_gui.free_file_format.sep = str(self.sep.GetValue())
@@ -261,8 +261,8 @@
         
self.spin_name_col.SetValue(int_to_gui(ds.relax_gui.free_file_format.spin_name_col))
         if hasattr(self, 'data_col'):
             
self.data_col.SetValue(int_to_gui(ds.relax_gui.free_file_format.data_col))
-        if hasattr(self, 'err_col'):
-            
self.err_col.SetValue(int_to_gui(ds.relax_gui.free_file_format.err_col))
+        if hasattr(self, 'error_col'):
+            
self.error_col.SetValue(int_to_gui(ds.relax_gui.free_file_format.error_col))
 
         # The column separator.
         if not ds.relax_gui.free_file_format.sep: