r13634 - in /branches/gui_testing/gui: analyses/auto_noe.py analyses/auto_rx_base.py components/spectrum.py -- July 15, 2011 - 09:33

Author: bugman
Date: Fri Jul 15 09:33:49 2011
New Revision: 13634

URL: http://svn.gna.org/viewcvs/relax?rev=13634&view=rev
Log:
Renamed Peak_intensity to Spectra_list to better reflect the GUI element.


Modified:
    branches/gui_testing/gui/analyses/auto_noe.py
    branches/gui_testing/gui/analyses/auto_rx_base.py
    branches/gui_testing/gui/components/spectrum.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=13634&r1=13633&r2=13634&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Fri Jul 15 09:33:49 2011
@@ -43,7 +43,7 @@
 from gui.analyses.execute import Execute
 from gui.analyses.results_analysis import color_code_noe
 from gui.base_classes import Container
-from gui.components.spectrum import Peak_intensity
+from gui.components.spectrum import Spectra_list
 from gui.controller import Redirect_text
 from gui.derived_wx_classes import StructureTextCtrl
 from gui.filedialog import opendir, openfile
@@ -230,7 +230,7 @@
 
         # Add the peak list selection GUI element, with spacing.
         box.AddSpacer(10)
-        self.peak_intensity = Peak_intensity(gui=self.gui, 
parent=self.parent, data=self.data, label="NOE", box=box, 
fn_add=self.peak_wizard)
+        self.peak_intensity = Spectra_list(gui=self.gui, parent=self.parent, 
data=self.data, label="NOE", box=box, fn_add=self.peak_wizard)
         box.AddSpacer(10)
 
         # Add the execution GUI element.

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=13634&r1=13633&r2=13634&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Fri Jul 15 09:33:49 2011
@@ -41,7 +41,7 @@
 from gui.analyses.base import Base_frame
 from gui.analyses.execute import Execute
 from gui.base_classes import Container
-from gui.components.spectrum import Peak_intensity
+from gui.components.spectrum import Spectra_list
 from gui.controller import Redirect_text
 from gui.derived_wx_classes import StructureTextCtrl
 from gui.filedialog import opendir
@@ -240,7 +240,7 @@
 
         # Add the peak list selection GUI element, with spacing.
         box.AddSpacer(10)
-        self.peak_intensity = Peak_intensity(gui=self.gui, 
parent=self.parent, data=self.data, label=self.label, box=box)
+        self.peak_intensity = Spectra_list(gui=self.gui, parent=self.parent, 
data=self.data, label=self.label, box=box)
         box.AddSpacer(10)
 
         # Add the execution GUI element.

Modified: branches/gui_testing/gui/components/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/components/spectrum.py?rev=13634&r1=13633&r2=13634&view=diff
==============================================================================
--- branches/gui_testing/gui/components/spectrum.py (original)
+++ branches/gui_testing/gui/components/spectrum.py Fri Jul 15 09:33:49 2011
@@ -33,8 +33,8 @@
 from gui import paths
 
 
-class Peak_intensity:
-    """The peak list selection class."""
+class Spectra_list:
+    """The GUI element for listing loaded spectral data."""
 
     # Class variables.
     col_label_width = 40
@@ -42,7 +42,7 @@
     col2_width = 140
 
     def __init__(self, gui=None, parent=None, data=None, label=None, 
width=688, height=300, box=None, fn_add=None):
-        """Build the peak list reading GUI element.
+        """Build the spectral list GUI element.
 
         @keyword gui:       The main GUI object.
         @type gui:          wx.Frame instance