r10291 - in /branches/bieri_gui/gui_bieri/execution: calc_modelfree.py calc_noe.py calc_rx.py -- January 22, 2010 - 17:47

Author: bugman
Date: Fri Jan 22 17:47:31 2010
New Revision: 10291

URL: http://svn.gna.org/viewcvs/relax?rev=10291&view=rev
Log:
Fixed all the imports in the gui_bieri.execution package.

This includes fixing paths, removing many unused imports, alphabetical 
ordering, and general clean
ups.


Modified:
    branches/bieri_gui/gui_bieri/execution/calc_modelfree.py
    branches/bieri_gui/gui_bieri/execution/calc_noe.py
    branches/bieri_gui/gui_bieri/execution/calc_rx.py

Modified: branches/bieri_gui/gui_bieri/execution/calc_modelfree.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/execution/calc_modelfree.py?rev=10291&r1=10290&r2=10291&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/execution/calc_modelfree.py (original)
+++ branches/bieri_gui/gui_bieri/execution/calc_modelfree.py Fri Jan 22 
17:47:31 2010
@@ -24,27 +24,21 @@
 # script to calculate model-free models
 
 # Python module imports.
-from os import getcwd, listdir, sep
+from os import listdir, sep
+from re import search
 from string import replace
-from re import search
 import time
-import sys
-import os
 
 # relax module imports.
 from float import floatAsByteArray
+from generic_fns import diffusion_tensor, eliminate, fix, grace, minimise, 
model_selection, monte_carlo, pipes, relax_data, results, selection, 
sequence, spectrum, value
 from generic_fns.mol_res_spin import generate_spin_id, spin_index_loop, 
spin_loop
-from generic_fns import pipes
 import generic_fns.structure.main
 from relax_errors import RelaxError
-from specific_fns.setup import relax_fit_obj, model_free_obj
-from generic_fns.state import save_state
-from generic_fns import monte_carlo, results, minimise, pipes, 
diffusion_tensor, fix, sequence, spectrum, relax_data, selection, value, 
grace, eliminate, model_selection
-from minfx.generic import generic_minimise
-import generic_fns.structure.geometric
-
-# relaxGUI module import
-from message import relax_run_ok
+from specific_fns.setup import model_free_obj
+
+# relaxGUI module imports.
+from gui_bieri.message import relax_run_ok
 
 
 ### Model-free

Modified: branches/bieri_gui/gui_bieri/execution/calc_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/execution/calc_noe.py?rev=10291&r1=10290&r2=10291&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/execution/calc_noe.py (original)
+++ branches/bieri_gui/gui_bieri/execution/calc_noe.py Fri Jan 22 17:47:31 
2010
@@ -24,23 +24,14 @@
 # Python module imports.
 from os import getcwd, listdir, sep
 from string import replace
+import sys
 import time
-import sys
-import os
 import wx
 
 # relax module imports.
-from float import floatAsByteArray
-from generic_fns.mol_res_spin import generate_spin_id, spin_index_loop, 
spin_loop
-from generic_fns import pipes, spectrum, value, grace, minimise, selection, 
results
+from generic_fns import grace, minimise, pipes, results, selection, 
spectrum, state, value
 import generic_fns.structure.main
-from relax_errors import RelaxError
 from specific_fns.setup import noe_obj
-from generic_fns.state import save_state
-
-# relaxGUI module import
-from results_analysis import color_code_noe
-from message import relax_run_ok
 
 
 ####### Class to redirect relax output to relaxGUI - log panel and progress 
bar
@@ -174,7 +165,7 @@
         results.write(file='results', directory=resultsdir, force=True)
         
         # Save the program state.
-        save_state('save', dir = resultsdir, force=True)
+        state.save_state('save', dir = resultsdir, force=True)
         
         print ""
         print ""

Modified: branches/bieri_gui/gui_bieri/execution/calc_rx.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/execution/calc_rx.py?rev=10291&r1=10290&r2=10291&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/execution/calc_rx.py (original)
+++ branches/bieri_gui/gui_bieri/execution/calc_rx.py Fri Jan 22 17:47:31 2010
@@ -24,26 +24,15 @@
 # script to calculate rx
 
 # Python module imports.
-from os import getcwd, listdir, sep
 from string import replace
+import sys
 import time
-import sys
-import os
 import wx
 
 # relax module imports.
-from float import floatAsByteArray
-from generic_fns.mol_res_spin import generate_spin_id, spin_index_loop, 
spin_loop
+from generic_fns import monte_carlo, results, minimise, pipes, sequence, 
spectrum, selection, value, grace, state
 import generic_fns.structure.main
-from relax_errors import RelaxError
 from specific_fns.setup import relax_fit_obj
-from generic_fns.state import save_state
-from generic_fns import monte_carlo, results, minimise, pipes, 
diffusion_tensor, fix, sequence, spectrum, relax_data, selection, value, 
grace, eliminate
-from minfx.generic import generic_minimise
-
-# relaxGUI module import
-from results_analysis import color_code_noe
-from message import relax_run_ok, question
 
 
 ####### Class to redirect relax output to relaxGUI - log panel and progress 
bar
@@ -242,7 +231,7 @@
         results.write(file='results', directory=resultsdir, force=True)
         
         # Save the program state.
-        save_state('save', dir = resultsdir, force=True)
+        state.save_state('save', dir = resultsdir, force=True)
         
         print ""
         print ""