r13671 - /branches/gui_testing/gui/user_functions/spectrum.py -- July 18, 2011 - 10:05

Author: bugman
Date: Mon Jul 18 10:05:02 2011
New Revision: 13671

URL: http://svn.gna.org/viewcvs/relax?rev=13671&view=rev
Log:
Changed the order of the integration method and column in the GUI element.


Modified:
    branches/gui_testing/gui/user_functions/spectrum.py

Modified: branches/gui_testing/gui/user_functions/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/spectrum.py?rev=13671&r1=13670&r2=13671&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/spectrum.py (original)
+++ branches/gui_testing/gui/user_functions/spectrum.py Mon Jul 18 10:05:02 
2011
@@ -258,12 +258,12 @@
         self.heteronuc.SetValue('N')
         self.proton.SetValue('H')
 
-        # The integration column.
-        self.int_col = self.input_field(sizer, "The integration column:", 
tooltip=self.uf._doc_args_dict['int_col'])
-
         # The integration method.
         self.int_method = self.combo_box(sizer, "The peak integration 
method:", tooltip=self.uf._doc_args_dict['int_method'], choices=['height', 
'point sum', 'other'])
         self.int_method.SetValue('height')
+
+        # The integration column.
+        self.int_col = self.input_field(sizer, "The integration column:", 
tooltip=self.uf._doc_args_dict['int_col'])
 
         # The spin ID restriction.
         self.spin_id = self.spin_id_element(sizer, desc="Restrict data 
loading to certain spins:")
@@ -306,7 +306,7 @@
         spin_id = gui_to_str(self.spin_id.GetValue())
 
         # Read the peak intensities.
-        self.gui.interpreter.spectrum.read_intensities(file=file, 
spectrum_id=spectrum_id, heteronuc=heteronuc, proton=proton, int_col=int_col, 
int_method=int_method, spin_id_col=spin_id_col, mol_name_col=mol_name_col, 
res_num_col=res_num_col, res_name_col=res_name_col, 
spin_num_col=spin_num_col, spin_name_col=spin_name_col, sep=sep, 
spin_id=spin_id, ncproc=ncproc)
+        self.gui.interpreter.spectrum.read_intensities(file=file, 
spectrum_id=spectrum_id, heteronuc=heteronuc, proton=proton, 
int_method=int_method, int_col=int_col, spin_id_col=spin_id_col, 
mol_name_col=mol_name_col, res_num_col=res_num_col, 
res_name_col=res_name_col, spin_num_col=spin_num_col, 
spin_name_col=spin_name_col, sep=sep, spin_id=spin_id, ncproc=ncproc)