r13759 - in /branches/gui_testing/gui/analyses: auto_noe.py auto_rx_base.py base.py -- July 19, 2011 - 19:45

Author: bugman
Date: Tue Jul 19 19:45:34 2011
New Revision: 13759

URL: http://svn.gna.org/viewcvs/relax?rev=13759&view=rev
Log:
Shifted the launch_spin_editor() method into the base class where 
add_spin_systems() is located.

The launch_spin_editor() code was just being duplicated.


Modified:
    branches/gui_testing/gui/analyses/auto_noe.py
    branches/gui_testing/gui/analyses/auto_rx_base.py
    branches/gui_testing/gui/analyses/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=13759&r1=13758&r2=13759&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Tue Jul 19 19:45:34 2011
@@ -239,17 +239,6 @@
         event.Skip()
 
 
-    def launch_spin_editor(self, event):
-        """The spin editor GUI element.
-
-        @param event:   The wx event.
-        @type event:    wx event
-        """
-
-        # Show the molecule, residue, and spin tree window.
-        self.gui.show_tree(None)
-
-
     def peak_wizard(self, event):
         """Launch the NOE peak loading wizard.
 

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=13759&r1=13758&r2=13759&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Tue Jul 19 19:45:34 2011
@@ -124,7 +124,9 @@
 
 
     def assemble_data(self):
-        """Assemble the data required for the Relax_fit class.
+        """Assemble the data required for the auto-analysis.
+
+        See the docstring for auto_analyses.relax_fit for details.  All data 
is taken from the relax data store, so data upload from the GUI to there must 
have been previously performed.
 
         @return:    A container with all the data required for the 
auto-analysis.
         @rtype:     class instance, list of str
@@ -251,17 +253,6 @@
 
         # Terminate the event.
         event.Skip()
-
-
-    def launch_spin_editor(self, event):
-        """The spin editor GUI element.
-
-        @param event:   The wx event.
-        @type event:    wx event
-        """
-
-        # Show the molecule, residue, and spin tree window.
-        self.gui.show_tree(None)
 
 
     def peak_wizard(self, event):

Modified: branches/gui_testing/gui/analyses/base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/base.py?rev=13759&r1=13758&r2=13759&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/base.py (original)
+++ branches/gui_testing/gui/analyses/base.py Tue Jul 19 19:45:34 2011
@@ -483,6 +483,17 @@
         box.Add(right_box, 1, wx.ALL|wx.EXPAND, 0)
 
 
+    def launch_spin_editor(self, event):
+        """The spin editor GUI element.
+
+        @param event:   The wx event.
+        @type event:    wx event
+        """
+
+        # Show the molecule, residue, and spin tree window.
+        self.gui.show_tree(None)
+
+
     def spin_count(self):
         """Count the number of loaded spins, returning a string formatted as 
'xxx spins loaded'.