r25548 - in /trunk/gui: components/spectrum.py wizards/peak_intensity.py -- September 02, 2014 - 15:27

Author: bugman
Date: Tue Sep  2 15:27:23 2014
New Revision: 25548

URL: http://svn.gna.org/viewcvs/relax?rev=25548&view=rev
Log:
Added a button for the spectrum.error_analysis user function to the spectra 
list GUI element.

This is placed after the 'Add' and 'Delete' buttons.  The functionality could 
be improved by
presetting the spectrum ID argument to anything the user has selected in the 
spectrum list.


Modified:
    trunk/gui/components/spectrum.py
    trunk/gui/wizards/peak_intensity.py

Modified: trunk/gui/components/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/components/spectrum.py?rev=25548&r1=25547&r2=25548&view=diff
==============================================================================
--- trunk/gui/components/spectrum.py    (original)
+++ trunk/gui/components/spectrum.py    Tue Sep  2 15:27:23 2014
@@ -328,6 +328,17 @@
         uf_store['spectrum.delete'](spectrum_id=id)
 
 
+    def action_spectrum_error_analysis(self, event):
+        """Launch the spectrum.error_analysis user function.
+
+        @param event:   The wx event.
+        @type event:    wx event
+        """
+
+        # Launch the dialog.
+        uf_store['spectrum.error_analysis']()
+
+
     def action_spectrum_integration_points(self, event):
         """Launch the spectrum.integration_points user function.
 
@@ -703,6 +714,7 @@
 
         # Button set up.
         self.button_placement = 'top'
+        self.button_size = (170, 40)
         self.button_info = [
             {
                 'object': 'button_add',
@@ -716,6 +728,12 @@
                 'icon': fetch_icon('oxygen.actions.list-remove', "22x22"),
                 'method': self.action_spectrum_delete,
                 'tooltip': "Delete loaded relaxation data from the relax 
data store."
+            }, {
+                'object': 'button_error_analysis',
+                'label': ' Error analysis',
+                'icon': 
fetch_icon('oxygen.categories.applications-education', "22x22"),
+                'method': self.action_spectrum_error_analysis,
+                'tooltip': "Perform a peak intensity error analysis on the 
currently loaded data or data subsets."
             }
         ]
 

Modified: trunk/gui/wizards/peak_intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/wizards/peak_intensity.py?rev=25548&r1=25547&r2=25548&view=diff
==============================================================================
--- trunk/gui/wizards/peak_intensity.py (original)
+++ trunk/gui/wizards/peak_intensity.py Tue Sep  2 15:27:23 2014
@@ -415,7 +415,7 @@
     # Class variables.
     image_path = WIZARD_IMAGE_PATH + 'spectrum' + sep + 'spectrum_200.png'
     title = "Specify the type of error to be used"
-    main_text = "Please specify from where the peak intensity errors will be 
obtained.  The is required for the execution of the spectrum.error_analysis 
user function which will be postponed until after clicking on the 'Execute 
relax' button at the end of the automatic analysis page.  To understand how 
the errors will be propagated and analysed, the main parts of the 
spectrum.error_analysis user function description are given below."
+    main_text = "Please specify from where the peak intensity errors will be 
obtained.  The is required for the execution of the spectrum.error_analysis 
user function which you will find as a button in the main spectra list GUI 
element.  To understand how the errors will be propagated and analysed, the 
main parts of the spectrum.error_analysis user function description are given 
below."
     uf_path = ['spectrum', 'error_analysis']
 
     def _on_select(self, event):