Author: bugman Date: Thu Jan 21 07:40:02 2010 New Revision: 10274 URL: http://svn.gna.org/viewcvs/relax?rev=10274&view=rev Log: Replaced modules for each calculation with log window modules. This corresponds to the import_logwindow_modules_patch file attached to https://gna.org/task/?6847 by Michael Bieri (https://gna.org/users/michaelbieri), in the zip file 100121_patches.tar.gz (https://gna.org/support/download.php?file_id=7726). Note this patch was corrupted so the gui_bieri.relax_gui module was manually modified! added: from res.relax_control import start_rx, start_noe, start_modelfree deleted: from res.calc_noe import make_noe from res.calc_rx import make_rx from res.calc_modelfree import start_model_free Modified: branches/bieri_gui/gui_bieri/relax_gui.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=10274&r1=10273&r2=10274&view=diff ============================================================================== --- branches/bieri_gui/gui_bieri/relax_gui.py (original) +++ branches/bieri_gui/gui_bieri/relax_gui.py Thu Jan 21 07:40:02 2010 @@ -46,14 +46,12 @@ # relaxGUI module import from res.about import about_relax from res.settings import relax_global_settings, import_file_settings, load_sequence -from res.calc_noe import make_noe -from res.calc_rx import make_rx -from res.calc_modelfree import start_model_free from res.filedialog import openfile, multi_openfile, savefile, opendir from res.message import relax_run_ok, missing_data, exec_relax, question, dir_message from res.results_analysis import results_table, color_code_noe, model_free_results, see_results from res.select_model_calc import whichmodel, check_entries from res.project import create_save_file, open_file +from res.relax_control import start_rx, start_noe, start_modelfree #####################################################################################################################