r13204 - in /branches/gui_testing/gui/analyses: auto_noe.py auto_rx_base.py -- June 23, 2011 - 21:02

Author: bugman
Date: Thu Jun 23 21:02:35 2011
New Revision: 13204

URL: http://svn.gna.org/viewcvs/relax?rev=13204&view=rev
Log:
The NOE and Rx auto analysis tabs now store their names in the relax data 
store.

This matches the auto model-free tab changes in r13170.


Modified:
    branches/gui_testing/gui/analyses/auto_noe.py
    branches/gui_testing/gui/analyses/auto_rx_base.py

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=13204&r1=13203&r2=13204&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Thu Jun 23 21:02:35 2011
@@ -60,11 +60,13 @@
     bitmap = None
     label = None
 
-    def __init__(self, gui, notebook, data_index=None):
+    def __init__(self, gui, analysis_name, notebook, data_index=None):
         """Build the automatic NOE analysis GUI frame elements.
 
         @param gui:             The main GUI class.
         @type gui:              gui.relax_gui.Main instance
+        @param analysis_name:   The name of the analysis (the name in the 
tab part of the notebook).
+        @type analysis_name:    str
         @param notebook:        The notebook to pack this frame into.
         @type notebook:         wx.Notebook instance
         @keyword data_index:    The index of the analysis in the relax data 
store (set to None if no data currently exists).
@@ -78,6 +80,9 @@
         if data_index == None:
             # Generate a storage container in the relax data store, and 
alias it for easy access.
             data_index = ds.relax_gui.analyses.add('NOE')
+
+            # Store the analysis name.
+            ds.relax_gui.analyses[data_index].analysis_name = analysis_name
 
             # Initialise the variables.
             ds.relax_gui.analyses[data_index].frq = ''

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=13204&r1=13203&r2=13204&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Thu Jun 23 21:02:35 2011
@@ -60,11 +60,13 @@
     bitmap = None
     label = None
 
-    def __init__(self, gui, notebook, data_index=None):
+    def __init__(self, gui, analysis_name, notebook, data_index=None):
         """Build the automatic R1 and R2 analysis GUI frame elements.
 
         @param gui:             The main GUI class.
         @type gui:              gui.relax_gui.Main instance
+        @param analysis_name:   The name of the analysis (the name in the 
tab part of the notebook).
+        @type analysis_name:    str
         @param notebook:        The notebook to pack this frame into.
         @type notebook:         wx.Notebook instance
         @keyword data_index:    The index of the analysis in the relax data 
store (set to None if no data currently exists).
@@ -78,6 +80,9 @@
         if data_index == None:
             # Generate a storage container in the relax data store, and 
alias it for easy access.
             data_index = ds.relax_gui.analyses.add(self.label)
+
+            # Store the analysis name.
+            ds.relax_gui.analyses[data_index].analysis_name = analysis_name
 
             # Initialise the variables.
             ds.relax_gui.analyses[data_index].frq = ''