r10600 - in /branches/bieri_gui/gui_bieri: analyses/auto_model_free.py analyses/auto_rx_base.py relax_gui.py -- January 29, 2010 - 16:08

Author: bugman
Date: Fri Jan 29 16:08:50 2010
New Revision: 10600

URL: http://svn.gna.org/viewcvs/relax?rev=10600&view=rev
Log:
Bug fix for the loading of the relax save state.

This is only fixing a bug in the current hardcoded design and will not be 
needed if the GUI is made
more dynamic. 


Modified:
    branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
    branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py
    branches/bieri_gui/gui_bieri/relax_gui.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=10600&r1=10599&r2=10600&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Fri Jan 29 
16:08:50 2010
@@ -860,6 +860,16 @@
                 print ('Final Model-free calculation was successful !')
 
 
+    def link_data(self, data):
+        """Re-alias the storage container in the relax data store.
+        @keyword data:      The data storage container.
+        @type data:         class instance
+        """
+
+        # Alias.
+        self.data = data
+
+
     def model_noe1(self, event): # load noe1
         backup = self.m_noe_1.GetValue()
         self.data.paramfiles1[0] = openfile(msg='Select NOE file', 
filetype='*.*', default='all files (*.*)|*.*')

Modified: branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py?rev=10600&r1=10599&r2=10600&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py Fri Jan 29 16:08:50 
2010
@@ -336,6 +336,19 @@
         start_rx(self.resultsdir_r21.GetValue(), r2_list, relax_times_r2_1, 
self.field_structure.GetValue(), self.nmrfreq_value_r11.GetValue(), 2, 1, 
self.field_unresolved.GetValue(), self, 1, global_setting, file_setting, 
sequencefile)
 
 
+    def link_data(self, data):
+        """Re-alias the storage container in the relax data store.
+        @keyword data:      The data storage container.
+        @type data:         class instance
+        """
+
+        # Re-alias.
+        self.data = data
+
+        # Re-alias in the peak intensity object as well.
+        self.peak_intensity.data = data
+
+
     def results_directory(self, event):
         """The results directory selection.
 

Modified: branches/bieri_gui/gui_bieri/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/relax_gui.py?rev=10600&r1=10599&r2=10600&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Fri Jan 29 16:08:50 2010
@@ -1170,18 +1170,24 @@
         # Load the relax state.
         state.load_state(filename, verbosity=0)
 
+        # FIXME: (commented out until analyses are dynamically loaded and 
unloaded).
+        ## Build the analysis frames
+        #for i in range(len(ds.relax_gui.analyses)):
+        #    # The automatic model-free protocol frame
+        #    if ds.relax_gui.analyses[i].analysis_type == 'model-free':
+        #        self.analysis_frames.append(Auto_model_free(self))
+
+        # FIXME:  Temporary fix - set the data structures explicitly.
+        
self.analysis_frames[self.hardcoded_index_r1_1].link_data(ds.relax_gui.analyses[self.r1_index[0]])
+        
self.analysis_frames[self.hardcoded_index_r1_2].link_data(ds.relax_gui.analyses[self.r1_index[1]])
+        
self.analysis_frames[self.hardcoded_index_r1_3].link_data(ds.relax_gui.analyses[self.r1_index[2]])
+        
self.analysis_frames[self.hardcoded_index_r2_1].link_data(ds.relax_gui.analyses[self.r2_index[0]])
+        
self.analysis_frames[self.hardcoded_index_r2_2].link_data(ds.relax_gui.analyses[self.r2_index[1]])
+        
self.analysis_frames[self.hardcoded_index_r2_3].link_data(ds.relax_gui.analyses[self.r2_index[2]])
+        
self.analysis_frames[self.hardcoded_index_mf].link_data(ds.relax_gui.analyses[9])
+
         # Update the core of the GUI to match the new data store.
         self.sync_ds(upload=False)
-
-        # Build the analysis frames
-        for i in range(len(ds.relax_gui.analyses)):
-            # The automatic model-free protocol frame
-            if ds.relax_gui.analyses[i].analysis_type == 'model-free':
-                # FIXME: (commented out until analyses are dynamically 
loaded and unloaded).
-                #self.analysis_frames.append(Auto_model_free(self))
-
-                # FIXME:  Temporary fix - set the model-free data structure 
explicitly.
-                self.analysis_frames[self.hardcoded_index_mf].data = 
ds.relax_gui.analyses[i]
 
         # Execute the analysis frame specific update methods.
         for analysis in self.analysis_frames: