r13701 - /branches/gui_testing/generic_fns/reset.py -- July 18, 2011 - 18:08

Author: bugman
Date: Mon Jul 18 18:08:55 2011
New Revision: 13701

URL: http://svn.gna.org/viewcvs/relax?rev=13701&view=rev
Log:
Reverted both r13693 and r13658, as this resetting of the status object was a 
very bad idea!!!

The commands used were:
svn merge -r13693:13692 .
svn merge -r13658:13657 .

This resetting was killing relax's execution state when scripting!

.....
  r13693 | bugman | 2011-07-18 15:14:26 +0200 (Mon, 18 Jul 2011) | 3 lines
  Changed paths:
     M /branches/gui_testing/generic_fns/reset.py
  
  Fix for the reset() function while in GUI mode - the status.show_gui flag 
is preserved.
.....
  r13658 | bugman | 2011-07-15 18:55:01 +0200 (Fri, 15 Jul 2011) | 3 lines
  Changed paths:
     M /branches/gui_testing/generic_fns/reset.py
  
  The reset method now reinitialises the relax status object.
.....


Modified:
    branches/gui_testing/generic_fns/reset.py

Modified: branches/gui_testing/generic_fns/reset.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/reset.py?rev=13701&r1=13700&r2=13701&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/reset.py (original)
+++ branches/gui_testing/generic_fns/reset.py Mon Jul 18 18:08:55 2011
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2003-2011 Edward d'Auvergne                                  
 #
+# Copyright (C) 2003-2004, 2006-2008 Edward d'Auvergne                       
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -22,7 +22,6 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
-from status import Status; status = Status()
 
 
 def reset():
@@ -30,8 +29,3 @@
 
     # Run the relax data storage object reset method.
     ds.__reset__()
-
-    # Re-setup the status object, preserving a few flags.
-    show_gui = status.show_gui
-    status._setup()
-    status.show_gui = show_gui