r14134 - in /branches/gui_testing/gui: errors.py misc.py user_functions/grace.py user_functions/value.py -- August 04, 2011 - 15:18

Author: bugman
Date: Thu Aug  4 15:18:41 2011
New Revision: 14134

URL: http://svn.gna.org/viewcvs/relax?rev=14134&view=rev
Log:
Reverted r14133 as there is a better way of handling this.

The command used was:
svn merge -r14133:14132 .


Modified:
    branches/gui_testing/gui/errors.py
    branches/gui_testing/gui/misc.py
    branches/gui_testing/gui/user_functions/grace.py
    branches/gui_testing/gui/user_functions/value.py

Modified: branches/gui_testing/gui/errors.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/errors.py?rev=14134&r1=14133&r2=14134&view=diff
==============================================================================
--- branches/gui_testing/gui/errors.py (original)
+++ branches/gui_testing/gui/errors.py Thu Aug  4 15:18:41 2011
@@ -31,7 +31,7 @@
 from status import Status; status = Status()
 
 
-def gui_raise(relax_error, raise_flag=False):
+def gui_raise(relax_error, raise_flag=True):
     """Handle errors in the GUI to be reported to the user.
 
     @param relax_error:     The error object.

Modified: branches/gui_testing/gui/misc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/misc.py?rev=14134&r1=14133&r2=14134&view=diff
==============================================================================
--- branches/gui_testing/gui/misc.py (original)
+++ branches/gui_testing/gui/misc.py Thu Aug  4 15:18:41 2011
@@ -359,7 +359,7 @@
     # Catch RelaxErrors.
     except AllRelaxErrors, instance:
         # Display a dialog with the error.
-        gui_raise(instance, raise_flag=False)
+        gui_raise(instance, raise_flag=True)
 
         # Failure.
         return False

Modified: branches/gui_testing/gui/user_functions/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/grace.py?rev=14134&r1=14133&r2=14134&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/grace.py (original)
+++ branches/gui_testing/gui/user_functions/grace.py Thu Aug  4 15:18:41 2011
@@ -196,7 +196,6 @@
         # Check the current data pipe.
         if cdp == None:
             gui_raise(RelaxNoPipeError())
-            return
 
         # Get the specific functions.
         data_names = specific_fns.setup.get_specific_fn('data_names', 
cdp.pipe_type, raise_error=False)
@@ -208,7 +207,6 @@
             names = data_names(set='params')
         except RelaxImplementError:
             gui_raise(RelaxImplementError())
-            return
 
         # First add the sequence data.
         combo_box.Append(str_to_gui("Spin sequence"), 'spin')

Modified: branches/gui_testing/gui/user_functions/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/value.py?rev=14134&r1=14133&r2=14134&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/value.py (original)
+++ branches/gui_testing/gui/user_functions/value.py Thu Aug  4 15:18:41 2011
@@ -173,7 +173,6 @@
         # Check the current data pipe.
         if cdp == None:
             gui_raise(RelaxNoPipeError())
-            return
 
         # Get the specific functions.
         data_names = specific_fns.setup.get_specific_fn('data_names', 
cdp.pipe_type, raise_error=False)
@@ -185,7 +184,6 @@
             names = data_names(set='params')
         except RelaxImplementError:
             gui_raise(RelaxImplementError())
-            return
 
         # Loop over the parameters.
         for name in (data_names(set='params') + data_names(set='generic')):