r11138 - /branches/bieri_gui/gui_bieri/analyses/results_analysis.py -- April 23, 2010 - 05:14

Author: michaelbieri
Date: Fri Apr 23 05:14:59 2010
New Revision: 11138

URL: http://svn.gna.org/viewcvs/relax?rev=11138&view=rev
Log:
Pymol macros only include pdb file if selected in main frame.

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

Modified: branches/bieri_gui/gui_bieri/analyses/results_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/results_analysis.py?rev=11138&r1=11137&r2=11138&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/results_analysis.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/results_analysis.py Fri Apr 23 
05:14:59 2010
@@ -73,11 +73,10 @@
     file.close()
 
 
-def model_free_results(self):
+def model_free_results(self, directory, pdbfile):
     """Create the model-free results."""
 
-    directory = str(self.resultsdir_r21_copy_2.GetValue()) + sep + 'final'
-    pdbfile = str(self.structure_noe1.GetValue())
+    directory = directory + sep + 'final'
 
     #Read results
     pipename = 'Data_extraction ' + str(time.asctime(time.localtime()))
@@ -229,7 +228,8 @@
     #create file
 
     file = open(str(directory) +sep + 's2.pml', 'w')
-    file.write("load " + pdbfile + '\n')
+    if pdbfile:
+        file.write("load " + pdbfile + '\n')
     file.write("bg_color white\n")
     file.write("color gray90\n")
     file.write("hide all\n")
@@ -266,7 +266,8 @@
     #create file
 
     file = open(str(directory) + sep + 'rex.pml', 'w')
-    file.write("load " + pdbfile + '\n')
+    if pdbfile:
+        file.write("load " + pdbfile + '\n')
     file.write("bg_color white\n")
     file.write("color gray90\n")
     file.write("hide all\n")