r11118 - /branches/bieri_gui/gui_bieri/analyses/auto_model_free.py -- April 22, 2010 - 06:37

Author: michaelbieri
Date: Thu Apr 22 06:37:29 2010
New Revision: 11118

URL: http://svn.gna.org/viewcvs/relax?rev=11118&view=rev
Log:
Structure file is loaded or set to None if sequence file is selected.

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

Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_model_free.py?rev=11118&r1=11117&r2=11118&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Thu Apr 22 
06:37:29 2010
@@ -513,11 +513,12 @@
                 data.mf_models.append('m%i' % i)
                 data.local_tm_models.append('tm%i' % i)
 
-        # The PDB file (set this to None if no structure is available).
-        if self.data.structure_file == '':
+        # Structure File
+        data.structure_file = self.data.structure_file
+
+        # Set Structure file as None if a structure file is loaded.
+        if data.structure_file == '!!! Sequence file selected !!!':
             data.structure_file = None
-        else:
-            data.structure_file = self.data.structure_file
 
         # The sequence data (file name, dir, mol_name_col, res_num_col, 
res_name_col, spin_num_col, spin_name_col, sep).  These are the arguments to 
the  sequence.read() user function, for more information please see the 
documentation for that function.
         data.seq_args = [ds.relax_gui.sequencefile, None, None, 1, None, 
None, None, None]