r13037 - in /branches/gui_testing/gui: analyses/auto_rx_base.py relax_gui.py -- June 15, 2011 - 14:15

Author: bugman
Date: Wed Jun 15 14:15:38 2011
New Revision: 13037

URL: http://svn.gna.org/viewcvs/relax?rev=13037&view=rev
Log:
The R1 and R2 tabs are now also self initialised.


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

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=13037&r1=13036&r2=13037&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Wed Jun 15 14:15:38 2011
@@ -60,22 +60,28 @@
     bitmap = None
     label = None
 
-    def __init__(self, gui, notebook, hardcoded_index=None):
+    def __init__(self, gui, notebook):
         """Build the automatic R1 and R2 analysis GUI frame elements.
 
         @param gui:                 The main GUI class.
         @type gui:                  gui.relax_gui.Main instance
         @param notebook:            The notebook to pack this frame into.
         @type notebook:             wx.Notebook instance
-        @keyword hardcoded_index:   Kludge for the current GUI layout.
-        @type hardcoded_index:      int
         """
 
         # Store the main class.
         self.gui = gui
 
-        # Alias the storage container in the relax data store.
-        self.data = ds.relax_gui.analyses[hardcoded_index]
+        # Generate a storage container in the relax data store, and alias it 
for easy access.
+        self.data = ds.relax_gui.analyses.add(self.label)
+
+        # Initialise the variables.
+        self.data.frq = ''
+        self.data.num = 0
+        self.data.file_list = []
+        self.data.ncyc = []
+        self.data.relax_times = []
+        self.data.save_dir = self.gui.launch_dir
 
         # The parent GUI element for this class.
         self.parent = wx.Panel(notebook, -1)

Modified: branches/gui_testing/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/relax_gui.py?rev=13037&r1=13036&r2=13037&view=diff
==============================================================================
--- branches/gui_testing/gui/relax_gui.py (original)
+++ branches/gui_testing/gui/relax_gui.py Wed Jun 15 14:15:38 2011
@@ -372,7 +372,7 @@
         """
 
         # FIXME: temporary vars until a wizard is made.
-        analysis_type = 'noe'
+        analysis_type = 'r1'
 
         # Starting from the initial state.
         if self.init_state: