r10210 - in /branches/bieri_gui/gui_bieri: relax_gui.py res/calc_rx.py res/results_analysis.py -- January 14, 2010 - 14:58

Author: bugman
Date: Thu Jan 14 14:58:33 2010
New Revision: 10210

URL: http://svn.gna.org/viewcvs/relax?rev=10210&view=rev
Log:
Fixes for the relaxGUI imports.

This corresponds to one component of the patch_II file attached to 
https://gna.org/task/?6847 by
Michael Bieri (https://gna.org/users/michaelbieri).

Again this is different as the import statements were not clearly separated 
and were messy.


Modified:
    branches/bieri_gui/gui_bieri/relax_gui.py
    branches/bieri_gui/gui_bieri/res/calc_rx.py
    branches/bieri_gui/gui_bieri/res/results_analysis.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=10210&r1=10209&r2=10210&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Thu Jan 14 14:58:33 2010
@@ -29,7 +29,6 @@
 from string import lower
 import wx
 import time
-import res
 from string import replace
 from string import lowercase
 from os import getcwd
@@ -44,7 +43,19 @@
 from relax_errors import RelaxError
 from version import version
 
-
+# relaxGUI module import
+from res.about import *
+from res.settings import *
+from res.calc_noe import *
+from res.calc_rx import *
+from res.calc_modelfree import start_model_free
+from res.filedialog import *
+from res.message import *
+from res.results_analysis import *
+from res.select_model_calc import *
+from res.project import *
+
+ 
 
#####################################################################################################################
 
#####################################################################################################################
 
#####################################################################################################################

Modified: branches/bieri_gui/gui_bieri/res/calc_rx.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/res/calc_rx.py?rev=10210&r1=10209&r2=10210&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/res/calc_rx.py (original)
+++ branches/bieri_gui/gui_bieri/res/calc_rx.py Thu Jan 14 14:58:33 2010
@@ -41,7 +41,11 @@
 from generic_fns import monte_carlo
 from minfx.generic import generic_minimise
 
+# relaxGUI module import
+from results_analysis import color_code_noe
+from message import relax_run_ok
 
+ 
 def make_rx(target_dir, relax_times, structure_pdb, nmr_freq, r1_r2, 
freq_no, unres, self, freqno):
 
         success = False

Modified: branches/bieri_gui/gui_bieri/res/results_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/res/results_analysis.py?rev=10210&r1=10209&r2=10210&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/res/results_analysis.py (original)
+++ branches/bieri_gui/gui_bieri/res/results_analysis.py Thu Jan 14 14:58:33 
2010
@@ -30,9 +30,6 @@
 import wx
 import time
 import res
-from res.easygui import *
-from res.about import *
-from res.settings import *
 from string import replace
 from string import lowercase
 from os import getcwd, sep