r13285 - in /branches/gui_testing/gui: analyses/__init__.py relax_gui.py -- June 29, 2011 - 14:03

Author: bugman
Date: Wed Jun 29 14:03:40 2011
New Revision: 13285

URL: http://svn.gna.org/viewcvs/relax?rev=13285&view=rev
Log:
Shifted code from relax_gui.state_load() to the new 
Analysis_controller.load_from_store().

This is to place all analysis code in the Analysis_controller class.


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

Modified: branches/gui_testing/gui/analyses/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/__init__.py?rev=13285&r1=13284&r2=13285&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/__init__.py (original)
+++ branches/gui_testing/gui/analyses/__init__.py Wed Jun 29 14:03:40 2011
@@ -118,6 +118,30 @@
             self.add_start_screen()
 
 
+    def load_from_store(self):
+        """Recreate the analyses from the relax data store."""
+
+        map = {'NOE': 'noe',
+               'R1': 'r1',
+               'R2': 'r2',
+               'model-free': 'mf'}
+        for i in range(len(ds.relax_gui.analyses)):
+            # The analysis name.
+            if hasattr(ds.relax_gui.analyses[i], 'analysis_name'):
+                analysis_name = ds.relax_gui.analyses[i].analysis_name
+            elif ds.relax_gui.analyses[i].analysis_type == 'NOE':
+                analysis_name = 'Steady-state NOE'
+            elif ds.relax_gui.analyses[i].analysis_type == 'R1':
+                analysis_name = 'R1 relaxation'
+            elif ds.relax_gui.analyses[i].analysis_type == 'R2':
+                analysis_name = 'R2 relaxation'
+            elif ds.relax_gui.analyses[i].analysis_type == 'model-free':
+                analysis_name = 'Model-free'
+
+            # Set up the analysis.
+            self.new_analysis(map[ds.relax_gui.analyses[i].analysis_type], 
analysis_name, index=i)
+
+
     def menu_close(self, event):
         """Close the currently opened analysis.
 

Modified: branches/gui_testing/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/relax_gui.py?rev=13285&r1=13284&r2=13285&view=diff
==============================================================================
--- branches/gui_testing/gui/relax_gui.py (original)
+++ branches/gui_testing/gui/relax_gui.py Wed Jun 29 14:03:40 2011
@@ -459,26 +459,8 @@
         # Load the relax state.
         state.load_state(filename, verbosity=0)
 
-        # Reconstruct the analysis tabs.
-        map = {'NOE': 'noe',
-               'R1': 'r1',
-               'R2': 'r2',
-               'model-free': 'mf'}
-        for i in range(len(ds.relax_gui.analyses)):
-            # The analysis name.
-            if hasattr(ds.relax_gui.analyses[i], 'analysis_name'):
-                analysis_name = ds.relax_gui.analyses[i].analysis_name
-            elif ds.relax_gui.analyses[i].analysis_type == 'NOE':
-                analysis_name = 'Steady-state NOE'
-            elif ds.relax_gui.analyses[i].analysis_type == 'R1':
-                analysis_name = 'R1 relaxation'
-            elif ds.relax_gui.analyses[i].analysis_type == 'R2':
-                analysis_name = 'R2 relaxation'
-            elif ds.relax_gui.analyses[i].analysis_type == 'model-free':
-                analysis_name = 'Model-free'
-
-            # Set up the analysis.
-            self.new_analysis(map[ds.relax_gui.analyses[i].analysis_type], 
analysis_name, index=i)
+        # Reconstruct the analyses.
+        self.analysis.load_from_store()
 
         # Update the core of the GUI to match the new data store.
         self.sync_ds(upload=False)