Author: bugman
Date: Thu Aug 4 11:55:53 2011
New Revision: 14112
URL: http://svn.gna.org/viewcvs/relax?rev=14112&view=rev
Log:
The results viewer window now uses cdp.result_files.
This decouples the files and their creation from the GUI. The open button
does not currently
function.
Modified:
branches/gui_testing/gui/analyses/auto_model_free.py
branches/gui_testing/gui/analyses/auto_noe.py
branches/gui_testing/gui/analyses/auto_rx_base.py
branches/gui_testing/gui/analyses/results.py
Modified: branches/gui_testing/gui/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_model_free.py?rev=14112&r1=14111&r2=14112&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_model_free.py (original)
+++ branches/gui_testing/gui/analyses/auto_model_free.py Thu Aug 4 11:55:53
2011
@@ -43,7 +43,6 @@
from gui.about import About_base
from gui.analyses.base import Base_analysis
from gui.analyses.execute import Execute
-from gui.analyses.results_analysis import model_free_results, see_results
from gui.base_classes import Container
from gui.components.relax_data import Relax_data_list
from gui.filedialog import opendir
@@ -207,7 +206,6 @@
ds.relax_gui.analyses[data_index].local_tm_models = ['tm0',
'tm1', 'tm2', 'tm3', 'tm4', 'tm5', 'tm6', 'tm7', 'tm8', 'tm9']
ds.relax_gui.analyses[data_index].mf_models = ['m0', 'm1', 'm2',
'm3', 'm4', 'm5', 'm6', 'm7', 'm8', 'm9']
ds.relax_gui.analyses[data_index].max_iter = "30"
- ds.relax_gui.analyses[data_index].results_list = []
# Alias the data.
self.data = ds.relax_gui.analyses[data_index]
@@ -687,41 +685,6 @@
for global_model in self.data.global_models:
# Start the protocol.
dauvergne_protocol.dAuvergne_protocol(pipe_name=self.data.pipe_name,
results_dir=self.data.save_dir, diff_model=global_model,
mf_models=self.data.mf_models, local_tm_models=self.data.local_tm_models,
grid_inc=self.data.inc, mc_sim_num=self.data.mc_sim_num,
max_iter=self.data.max_iter, conv_loop=self.data.conv_loop)
-
- # Create the results file.
- if global_model == 'final':
- # Alias the relax data store data.
- data = ds.relax_gui.analyses[self.data_index]
-
- # Is there a results list (old results file support)?
- if not hasattr(data, 'results_list'):
- data.results_list = []
-
- results_analysis = model_free_results(self, data.save_dir,
data.structure_file)
-
- # Add grace plots to results tab.
- directory = data.save_dir+sep+'final'
-
self.gui.list_modelfree.Append(directory+sep+'grace'+sep+'s2.agr')
-
self.gui.list_modelfree.Append(directory+sep+'Model-free_Results.csv')
-
self.gui.list_modelfree.Append(directory+sep+'diffusion_tensor.pml')
- self.gui.list_modelfree.Append(directory+sep+'s2.pml')
- self.gui.list_modelfree.Append(directory+sep+'rex.pml')
- self.gui.list_modelfree.Append('Table_of_Results')
-
- # Add results to relax data storage.
-
ds.relax_gui.results_model_free.append(directory+sep+'grace'+sep+'s2.agr')
-
ds.relax_gui.results_model_free.append(directory+sep+'Model-free_Results.txt')
-
ds.relax_gui.results_model_free.append(directory+sep+'diffusion_tensor.pml')
-
ds.relax_gui.results_model_free.append(directory+sep+'s2.pml')
-
ds.relax_gui.results_model_free.append(directory+sep+'rex.pml')
- ds.relax_gui.results_model_free.append('Table_of_Results')
-
- # set global results variables
- ds.relax_gui.table_residue = results_analysis[0]
- ds.relax_gui.table_model = results_analysis[1]
- ds.relax_gui.table_s2 = results_analysis[2]
- ds.relax_gui.table_rex = results_analysis[3]
- ds.relax_gui.table_te = results_analysis[4]
Modified: branches/gui_testing/gui/analyses/auto_noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_noe.py?rev=14112&r1=14111&r2=14112&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Thu Aug 4 11:55:53 2011
@@ -109,7 +109,6 @@
# Initialise the variables.
ds.relax_gui.analyses[data_index].frq = ''
ds.relax_gui.analyses[data_index].save_dir = self.gui.launch_dir
- ds.relax_gui.analyses[data_index].results_list = []
# Alias the data.
self.data = ds.relax_gui.analyses[data_index]
@@ -463,20 +462,6 @@
# Alias the relax data store data.
data = ds.relax_gui.analyses[self.data_index]
- # Is there a results list (old results file support)?
- if not hasattr(data, 'results_list'):
- data.results_list = []
-
- # Add the NOE grace plots to the results list.
- files = [
- data.save_dir+sep+'grace'+sep+'ref.agr',
- data.save_dir+sep+'grace'+sep+'sat.agr',
- data.save_dir+sep+'grace'+sep+'noe.agr'
- ]
- for file in files:
- if not file in data.results_list:
- data.results_list.append(file)
-
# FIXME: This must be shifted to the core of relax!!!
# Create a PyMOL macro, if a structure exists.
if hasattr(data, 'structure_file'):
@@ -484,4 +469,4 @@
color_code_noe(data.save_dir, data.structure_file)
# Add the macro to the results list.
- data.results_list.append(data.save_dir+sep+'noe.pml')
+ cdp.result_files.append(['pymol', data.save_dir+sep+'noe.pml'])
Modified: branches/gui_testing/gui/analyses/auto_rx_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_rx_base.py?rev=14112&r1=14111&r2=14112&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Thu Aug 4 11:55:53 2011
@@ -110,7 +110,6 @@
ds.relax_gui.analyses[data_index].grid_inc = None
ds.relax_gui.analyses[data_index].mc_sim_num = None
ds.relax_gui.analyses[data_index].save_dir = self.gui.launch_dir
- ds.relax_gui.analyses[data_index].results_list = []
# Alias the data.
self.data = ds.relax_gui.analyses[data_index]
@@ -488,19 +487,3 @@
# Alias the relax data store data.
data = ds.relax_gui.analyses[self.data_index]
-
- # Is there a results list (old results file support)?
- if not hasattr(data, 'results_list'):
- data.results_list = []
-
- # Add Rx grace plot to the results list.
- files = [
- data.save_dir+sep+'grace'+sep+self.data.file_root+'.agr',
- data.save_dir+sep+'grace'+sep+'intensities.agr',
- data.save_dir+sep+'grace'+sep+'intensities_norm.agr',
- data.save_dir+sep+'grace'+sep+'i0.agr',
- data.save_dir+sep+'grace'+sep+'chi2.agr'
- ]
- for file in files:
- if not file in data.results_list:
- data.results_list.append(file)
Modified: branches/gui_testing/gui/analyses/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/results.py?rev=14112&r1=14111&r2=14112&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/results.py (original)
+++ branches/gui_testing/gui/analyses/results.py Thu Aug 4 11:55:53 2011
@@ -25,6 +25,7 @@
"""Module containing the base class for the results frame."""
# Python module imports.
+from string import upper
import wx
# relax module imports.
@@ -176,12 +177,16 @@
page =
self.gui.analysis.get_page_from_name(gui_to_str(self.analysis_list.GetValue()))
# Nothing to do.
- if not hasattr(page, 'data') or not hasattr(page.data,
'results_list'):
+ if not hasattr(cdp, 'result_files'):
return
# Update the list.
- for i in range(len(page.data.results_list)):
- self.list.Append(str_to_gui(page.data.results_list[i]))
+ for i in range(len(cdp.result_files)):
+ # The text to display.
+ text = "%s%s file: %s" % (upper(cdp.result_files[i][0][0]),
cdp.result_files[i][0][1:], cdp.result_files[i][1])
+
+ # Add the text with the Python data.
+ self.list.Append(str_to_gui(text),
clientData=cdp.result_files[i])
def open_result_file(self, event):
r14112 - in /branches/gui_testing/gui/analyses: auto_model_free.py auto_noe.py auto_rx_base.py results.py