r10467 - /branches/bieri_gui/gui_bieri/analyses/auto_model_free.py -- January 28, 2010 - 10:10

Author: bugman
Date: Thu Jan 28 10:10:45 2010
New Revision: 10467

URL: http://svn.gna.org/viewcvs/relax?rev=10467&view=rev
Log:
Refactored the whichmodel() method.  It is now called choose_global_model().

The following have changed:
    The method has been renamed and shifted up.
    The arg has been turned into a keyword arg and has been renamed.
    A docstring has been made from the old comments.
    Comments have been added.
    The selection is now taken out of the dialog namespace (bug fix).


Modified:
    branches/bieri_gui/gui_bieri/analyses/auto_model_free.py

Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_model_free.py?rev=10467&r1=10466&r2=10467&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Thu Jan 28 
10:10:45 2010
@@ -625,6 +625,23 @@
         return check
 
 
+    def choose_global_model(self, local_tm_complete=False):
+        """Select the individual global models to solve, or all 
automatically.
+
+        @keyword local_tm_complete: A flag specifying if the local tm global 
model has been solved already.
+        @type local_tm_complete:    bool
+        @return:                    The global model selected, or 'full' for 
all.
+        @rtype:                     str
+        """
+
+        # The dialog.
+        dlg = Select_tensor(None, -1, "", local_tm_flag=local_tm_complete)
+        dlg.ShowModal()
+
+        # Return the choice.
+        return dlg.selection
+
+
     def exec_model_free(self, event):
         """Execute the automatic model-free protocol.
 
@@ -644,7 +661,8 @@
             return
 
         # The global model.
-        which_model = self.whichmodel(False)
+        which_model = self.choose_global_model(False)
+        print `which_model`
 
         # Solve for all global models.
         if which_model == 'full':
@@ -872,10 +890,3 @@
             self.data.results_dir_model = 
str(self.resultsdir_r21_copy_2.GetValue())
         else:
             
self.resultsdir_r21_copy_2.SetValue(str(self.data.results_dir_model))
-
-
-    def whichmodel(self, is_local_tm):
-        selection = None
-        dlg = Select_tensor(None, -1, "", local_tm_flag=is_local_tm)
-        dlg.ShowModal()
-        return selection