r13166 - in /branches/gui_testing/gui: analyses/wizard.py relax_gui.py -- June 22, 2011 - 17:15

Author: bugman
Date: Wed Jun 22 17:15:18 2011
New Revision: 13166

URL: http://svn.gna.org/viewcvs/relax?rev=13166&view=rev
Log:
The name of the analysis can now be changed in the new analysis wizard.

This is not propagated to the analyses yet.


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

Modified: branches/gui_testing/gui/analyses/wizard.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/wizard.py?rev=13166&r1=13165&r2=13166&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/wizard.py (original)
+++ branches/gui_testing/gui/analyses/wizard.py Wed Jun 22 17:15:18 2011
@@ -30,6 +30,7 @@
 
 # relax GUI module imports.
 from gui import paths
+from gui.misc import gui_to_str, str_to_gui
 from gui.wizard import Wiz_panel, Wiz_window
 
 
@@ -39,12 +40,12 @@
     def run(self):
         """Run through the analysis selection wizard, returning the results.
 
-        @return:    The analysis type and data pipe name.
-        @rtype:     str, str
+        @return:    The analysis type, analysis name, and data pipe name.
+        @rtype:     tuple of str
         """
 
         # Set up the wizard.
-        wizard = Wiz_window(size_x=800, size_y=600, title='Set parameter 
values')
+        wizard = Wiz_window(size_x=850, size_y=700, title='Set parameter 
values')
 
         # Add the new analysis panel.
         new_panel = New_analysis_panel(wizard)
@@ -57,8 +58,13 @@
         # Execute the wizard.
         wizard.run()
 
+        # Get the data.
+        analysis_type = new_panel.analysis_type
+        analysis_name = gui_to_str(new_panel.analysis_name.GetValue())
+        pipe_name = gui_to_str(pipe_panel.pipe_name.GetValue())
+
         # Return the analysis type and pipe name.
-        return new_panel.analysis_type, str(pipe_panel.pipe_name.GetValue())
+        return analysis_type, analysis_name, pipe_name
 
 
 
@@ -133,9 +139,33 @@
     """The panel for selection of the new analysis."""
 
     # Class variables.
-    image_path = paths.IMAGE_PATH + 'relax.gif'
-    main_text = 'Select one of the following analysis types.'
-    title = 'Start a new analysis'
+    image_path = paths.IMAGE_PATH + "relax.gif"
+    main_text = "A number of automatic analyses to be preformed using relax 
in GUI mode.  Although not as flexible or powerful as the prompt/scripting 
modes, this provides a quick and easy setup and execution for a number of 
analysis types.   These currently include the calculation of the steady-state 
NOE, the exponential curve-fitting for the R1 and R2 relaxation rates, and 
for a full and automatic model-free analysis using the d'Auvergne and Gooley, 
2008b protocol.  All analyses perform error propagation using the gold 
standard Monte Calro simulations.  Please select from one of the following 
analysis types:"
+    title = "Start a new analysis"
+
+    def add_artwork(self, sizer):
+        """Add the artwork to the dialog.
+
+        @param sizer:   A sizer object.
+        @type sizer:    wx.Sizer instance
+        """
+
+        # Create a vertical box.
+        sizer2 = wx.BoxSizer(wx.VERTICAL)
+
+        # Add a spacer.
+        sizer2.AddSpacer(30)
+
+        # Add the graphics.
+        self.image = wx.StaticBitmap(self, -1, wx.Bitmap(self.image_path, 
wx.BITMAP_TYPE_ANY))
+        sizer2.Add(self.image, 0, wx.TOP|wx.ALIGN_CENTER_HORIZONTAL, 0)
+
+        # Nest the sizers.
+        sizer.Add(sizer2)
+
+        # A spacer.
+        sizer.AddSpacer(self.art_spacing)
+
 
     def add_buttons(self, box):
         """The widget of analysis buttons.
@@ -183,6 +213,12 @@
 
         # Add the button widget.
         self.add_buttons(sizer)
+
+        # Add a spacer.
+        sizer.AddStretchSpacer(2)
+
+        # Add the analysis name field.
+        self.analysis_name = self.input_field(sizer, "The name of the new 
analysis:", tooltip='The name of the analysis can be changed to any text.')
 
 
     def create_button(self, box=None, size=None, bmp=None, text='', 
tooltip='', fn=None, disabled=False):
@@ -269,6 +305,9 @@
         # Toggle all buttons off.
         self.toggle(self.button_mf)
 
+        # Update the analysis name.
+        self.analysis_name.SetValue(str_to_gui('Model-free'))
+
         # Set the analysis type.
         self.analysis_type = 'mf'
 
@@ -283,6 +322,9 @@
         # Toggle all buttons off.
         self.toggle(self.button_noe)
 
+        # Update the analysis name.
+        self.analysis_name.SetValue(str_to_gui('Steady-state NOE'))
+
         # Set the analysis type.
         self.analysis_type = 'noe'
 
@@ -297,6 +339,9 @@
         # Toggle all buttons off.
         self.toggle(self.button_r1)
 
+        # Update the analysis name.
+        self.analysis_name.SetValue(str_to_gui('R1 relaxation'))
+
         # Set the analysis type.
         self.analysis_type = 'r1'
 
@@ -310,6 +355,9 @@
 
         # Toggle all buttons off.
         self.toggle(self.button_r2)
+
+        # Update the analysis name.
+        self.analysis_name.SetValue(str_to_gui('R2 relaxation'))
 
         # Set the analysis type.
         self.analysis_type = 'r2'

Modified: branches/gui_testing/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/relax_gui.py?rev=13166&r1=13165&r2=13166&view=diff
==============================================================================
--- branches/gui_testing/gui/relax_gui.py (original)
+++ branches/gui_testing/gui/relax_gui.py Wed Jun 22 17:15:18 2011
@@ -358,7 +358,7 @@
 
         # Initialise the analysis wizard, and obtain the user specified data.
         wizard = Analysis_wizard()
-        analysis_type, pipe_name = wizard.run()
+        analysis_name, analysis_type, pipe_name = wizard.run()
 
         # Initialise the new analysis.
         self.new_analysis(analysis_type)