r10698 - /branches/bieri_gui/gui_bieri/relax_gui.py -- February 16, 2010 - 10:22

Author: bugman
Date: Tue Feb 16 10:22:17 2010
New Revision: 10698

URL: http://svn.gna.org/viewcvs/relax?rev=10698&view=rev
Log:
Stored settings are now synchronized with settings dialog for relax settings 
and peak file settings.

This settings_read_patch patch was attached to https://gna.org/task/?6847 by 
Michael
Bieri (https://gna.org/users/michaelbieri), in the zip file patches.zip
(https://gna.org/support/download.php?file_id=8122).

The patch did not apply cleanly, so the last part of the patch was manually 
applied.


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=10698&r1=10697&r2=10698&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Tue Feb 16 10:22:17 2010
@@ -1008,11 +1008,10 @@
 
 
     def param_file_setting(self, event): # set up parameter files
-        global file_setting # import global variable
-        tmp_setting = import_file_settings(file_setting)
+        tmp_setting = import_file_settings(ds.relax_gui.file_setting)
         if not tmp_setting == None:
             if question('Do you realy want to change import file settings?'):
-                file_setting = tmp_setting
+                ds.relax_gui.file_setting = tmp_setting
         event.Skip()
 
 
@@ -1140,10 +1139,9 @@
 
     def reset_setting(self, event): #reset all settings
         global global_setting #import global variable
-        global file_setting # import global variable
         if question('Do you realy want to change relax settings?'):
-            global_setting = ['1.02 * 1e-10', '-172 * 1e-6', 'N', 'H', '11', 
'newton', '500']
-            file_setting = ['0', '1', '2', '3', '4', '5', '6']
+            ds.relax_gui.global_setting = ['1.02 * 1e-10', '-172 * 1e-6', 
'N', 'H', '11', 'newton', '500']
+            ds.relax_gui.file_setting = ['0', '1', '2', '3', '4', '5', '6']
 
 
     def sat_noe1(self, event):
@@ -1228,11 +1226,10 @@
 
 
     def settings(self, event): # set up for relax variables
-        global global_setting #import global variable
-        tmp_global = relax_global_settings(global_setting)
+        tmp_global = relax_global_settings(ds.relax_gui.global_setting)
         if not tmp_global == None:
             if question('Do you realy want to change relax settings?'):
-                global_setting = tmp_global
+                ds.relax_gui.global_setting = tmp_global
         event.Skip()