r13871 - /branches/gui_testing/gui/analyses/auto_model_free.py -- July 26, 2011 - 09:19

Author: bugman
Date: Tue Jul 26 09:19:56 2011
New Revision: 13871

URL: http://svn.gna.org/viewcvs/relax?rev=13871&view=rev
Log:
Renamed the local tm and model-free model GUI elements to end in '_field'.

This is to avoid confusion with the model list variables.


Modified:
    branches/gui_testing/gui/analyses/auto_model_free.py

Modified: branches/gui_testing/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_model_free.py?rev=13871&r1=13870&r2=13871&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_model_free.py (original)
+++ branches/gui_testing/gui/analyses/auto_model_free.py Tue Jul 26 09:19:56 
2011
@@ -282,8 +282,8 @@
         data.pipe_name = self.data.pipe_name
 
         # The model-free models (do not change these unless absolutely 
necessary).
-        data.local_tm_models = self.local_tm_models.GetValue()
-        data.mf_models = self.mf_models.GetValue()
+        data.local_tm_models = self.local_tm_model_field.GetValue()
+        data.mf_models = self.mf_model_field.GetValue()
 
         # A file containing a list of spins which can be dynamically 
excluded at any point within the analysis (when set to None, this variable is 
not used).
         data.exclude = None
@@ -383,10 +383,10 @@
         box.AddSpacer(10)
 
         # Add the local tau_m models GUI element, with spacing.
-        self.local_tm_models = Local_tm_list(self, box)
+        self.local_tm_model_field = Local_tm_list(self, box)
 
         # Add the model-free models GUI element, with spacing.
-        self.mf_models = Mf_list(self, box)
+        self.mf_model_field = Mf_list(self, box)
 
         # The optimisation settings.
         self.grid_inc = self.add_spin_element(box, self, text="Grid search 
increments:", default=11, min=1, max=100, tooltip="This is the number of 
increments per dimension of the grid search performed prior to numerical 
optimisation.")
@@ -523,15 +523,15 @@
 
         # The local tau_m models to use.
         if upload:
-            self.data.local_tm_models = self.local_tm_models.GetValue()
+            self.data.local_tm_models = self.local_tm_model_field.GetValue()
         else:
-            self.local_tm_models.SetValue(self.data.local_tm_models)
+            self.local_tm_model_field.SetValue(self.data.local_tm_models)
 
         # The model-free models to use.
         if upload:
-            self.data.mf_models = self.mf_models.GetValue()
+            self.data.mf_models = self.mf_model_field.GetValue()
         else:
-            self.mf_models.SetValue(self.data.mf_models)
+            self.mf_model_field.SetValue(self.data.mf_models)
 
         # The grid incs.
         if upload: