r19562 - /branches/relax_disp/gui/analyses/auto_relax_disp.py -- April 21, 2013 - 20:54

Author: bugman
Date: Sun Apr 21 20:54:08 2013
New Revision: 19562

URL: http://svn.gna.org/viewcvs/relax?rev=19562&view=rev
Log:
The relaxation dispersion GUI analysis now uses the dispersion parts of the 
peak intensity elements.

This includes activating the dispersion parts of the Spectra_list GUI element 
for displaying the
spectrum ID with associated metadata and the dispersion parts of the 
Peak_intensity_wizard for
loading the data.


Modified:
    branches/relax_disp/gui/analyses/auto_relax_disp.py

Modified: branches/relax_disp/gui/analyses/auto_relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_relax_disp.py?rev=19562&r1=19561&r2=19562&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Sun Apr 21 20:54:08 
2013
@@ -43,6 +43,7 @@
 from gui.wizards.peak_intensity import Peak_intensity_wizard
 from pipe_control.mol_res_spin import exists_mol_res_spin_data
 from pipe_control.pipes import has_bundle, has_pipe
+from specific_analyses.relax_disp import VAR_TIME_EXP
 from status import Status; status = Status()
 
 
@@ -128,6 +129,14 @@
         # Register the method for updating the spin count for the completion 
of user functions.
         self.observer_register()
 
+        # Set up some flags based on the experiment type.
+        self.relax_times_flag = False
+        if cdp.exp_type in VAR_TIME_EXP:
+            self.relax_times_flag = True
+        self.relax_disp_cpmg = False
+        if cdp.exp_type in ['cpmg', 'cpmg fixed']:
+            self.relax_disp_cpmg = True
+
         # Execute the base class method to build the panel.
         super(Auto_relax_disp, self).__init__(parent, id=id, pos=pos, 
size=size, style=style, name=name)
 
@@ -213,7 +222,7 @@
 
         # Add the peak list selection GUI element, with spacing.
         box.AddSpacer(20)
-        self.peak_intensity = Spectra_list(gui=self.gui, parent=self, 
box=box, id=str(self.data_index), fn_add=self.peak_wizard_launch)
+        self.peak_intensity = Spectra_list(gui=self.gui, parent=self, 
box=box, id=str(self.data_index), fn_add=self.peak_wizard_launch, 
relax_times=self.relax_times_flag, frq_flag=True, spin_lock_flag=(not 
self.relax_disp_cpmg), cpmg_frq_flag=self.relax_disp_cpmg)
         box.AddSpacer(10)
 
         # Add the dispersion models GUI element, with spacing.
@@ -317,7 +326,7 @@
         """
 
         # A new wizard instance.
-        self.peak_wizard = Peak_intensity_wizard(relax_disp=True)
+        self.peak_wizard = Peak_intensity_wizard(relax_disp=True, 
relax_disp_cpmg=self.relax_disp_cpmg, relax_disp_times=self.relax_times_flag)
 
 
     def relax_disp_exp_type(self, event):