r13290 - in /branches/gui_testing/gui/analyses: __init__.py results.py -- June 29, 2011 - 14:32

Author: bugman
Date: Wed Jun 29 14:32:04 2011
New Revision: 13290

URL: http://svn.gna.org/viewcvs/relax?rev=13290&view=rev
Log:
Created the new Analysis_controller.analysis_data_loop() for returning the 
relax data store containers.


Modified:
    branches/gui_testing/gui/analyses/__init__.py
    branches/gui_testing/gui/analyses/results.py

Modified: branches/gui_testing/gui/analyses/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/__init__.py?rev=13290&r1=13289&r2=13290&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/__init__.py (original)
+++ branches/gui_testing/gui/analyses/__init__.py Wed Jun 29 14:32:04 2011
@@ -70,6 +70,18 @@
 
         # The analyses page objects.
         self.analyses = []
+
+
+    def analysis_data_loop(self):
+        """Loop over the analyses, yielding the data objects.
+
+        @return:    The analysis data object from the relax data store.
+        @rtype:     data.gui.Analyses instance
+        """
+
+        # Loop over the analyses.
+        for i in range(len(self.analyses)):
+            yield ds.relax_gui.analyses[i]
 
 
     def analysis_loop(self):

Modified: branches/gui_testing/gui/analyses/results.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/results.py?rev=13290&r1=13289&r2=13290&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/results.py (original)
+++ branches/gui_testing/gui/analyses/results.py Wed Jun 29 14:32:04 2011
@@ -217,8 +217,11 @@
         self.analysis_list.Clear()
 
         # The list of analyses.
-        for i in range(len(ds.relax_gui.analyses)):
-            
self.analysis_list.Append(str_to_gui(ds.relax_gui.analyses[i].analysis_name))
+        for data in self.gui.analysis.analysis_data_loop():
+            self.analysis_list.Append(str_to_gui(data.analysis_name))
+
+        # Set the name to the current analysis.
+        
self.analysis_list.SetValue(str_to_gui(self.gui.analysis.current_analysis_name()))
 
 
     def update_window(self, event):