r10421 - /branches/bieri_gui/gui_bieri/relax_gui.py -- January 26, 2010 - 22:19

Author: bugman
Date: Tue Jan 26 22:19:50 2010
New Revision: 10421

URL: http://svn.gna.org/viewcvs/relax?rev=10421&view=rev
Log:
Converted to state_load() to use the relax data store.

The data store is first reset, and then the state loaded.  For some reason, 
the text fields do not
update yet!


Modified:
    branches/bieri_gui/gui_bieri/relax_gui.py

Modified: branches/bieri_gui/gui_bieri/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/relax_gui.py?rev=10421&r1=10420&r2=10421&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Tue Jan 26 22:19:50 2010
@@ -39,6 +39,7 @@
 from float import floatAsByteArray
 from generic_fns import pipes, state
 from generic_fns.mol_res_spin import generate_spin_id, spin_index_loop, 
spin_loop
+from generic_fns.reset import reset
 from relax_errors import RelaxError
 from version import version
 
@@ -2553,41 +2554,36 @@
         event.Skip()
 
 
-    def state_load(self, event): # Open
-        filename = openfile('Select file to open', sys.path[-1], 
'save.relaxGUI', 'relaxGUI files (*.relaxGUI)|*.relaxGUI|all files (*.*)|*.*')
-        if not filename == None:
-            global_return = open_file(self, filename)
-
-            # import global parameters
-            global global_setting
-            global file_setting
-            global sequencefile
-            global table_residue
-            global table_model
-            global table_s2
-            global table_rex
-            global table_te
-
-            # set global parameters
-            global_setting = global_return[0]
-            file_setting = global_return[1]
-            sequencefile = global_return[2]
-            table_residue = global_return[3]
-            table_model = global_return[4]
-            table_s2 = global_return[5]
-            table_rex = global_return[6]
-            table_te = global_return[7]
-        event.Skip()
-
-
-    def state_save(self, event):
-        """Save the program state.
+    def state_load(self, event):
+        """Load the program state.
 
         @param event:   The wx event.
         @type event:    wx event
         """
 
         # Open the dialog.
+        filename = openfile(msg='Select file to open', filetype='state.bz2', 
default='relax save files (*.bz2)|*.bz2|all files (*.*)|*.*')
+
+        # A file has been selected.
+        if filename:
+            # Reset the relax data store.
+            reset()
+
+            # Load the relax state.
+            state.load_state(filename)
+
+        # Skip the event.
+        event.Skip()
+
+
+    def state_save(self, event):
+        """Save the program state.
+
+        @param event:   The wx event.
+        @type event:    wx event
+        """
+
+        # Open the dialog.
         filename = savefile(msg='Select file to save', filetype='state.bz2', 
default='relax save files (*.bz2)|*.bz2|all files (*.*)|*.*')
 
         # Save the relax state.