r10477 - in /branches/bieri_gui/gui_bieri: analyses/auto_model_free.py relax_gui.py -- January 28, 2010 - 10:53

Author: bugman
Date: Thu Jan 28 10:53:35 2010
New Revision: 10477

URL: http://svn.gna.org/viewcvs/relax?rev=10477&view=rev
Log:
Import fixes for the relax controller window.


Modified:
    branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
    branches/bieri_gui/gui_bieri/relax_gui.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=10477&r1=10476&r2=10477&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:53:35 2010
@@ -32,7 +32,6 @@
 from data import Relax_data_store; ds = Relax_data_store()
 
 # relax GUI module imports.
-from gui_bieri.analyses.relax_control import start_modelfree
 from gui_bieri.analyses.results_analysis import model_free_results, 
see_results
 from gui_bieri.analyses.select_model_calc import Select_tensor
 from gui_bieri.derived_wx_classes import StructureTextCtrl

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=10477&r1=10476&r2=10477&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Thu Jan 28 10:53:35 2010
@@ -47,8 +47,8 @@
 from about import about_relax
 from analyses.auto_model_free import Auto_model_free
 from analyses.project import create_save_file, open_file
-from analyses.relax_control import start_modelfree, start_noe, start_rx
 from analyses.results_analysis import color_code_noe, model_free_results, 
results_table, see_results
+from controller import Controller
 from derived_wx_classes import StructureTextCtrl
 from filedialog import multi_openfile, opendir, openfile, savefile
 from message import dir_message, exec_relax, missing_data, question, 
relax_run_ok