r19545 - in /branches/relax_disp: ./ gui/ gui/analyses/ gui/components/ gui/spin_viewer/ gui/wizards/ test_suite/gui_tests/r19545 - in /branches/relax_disp: ./ gui/ gui/analyses/ gui/components/ gui/spin_viewer/ gui/wizards/ test_suite/gui_tests/Author: bugman Date: Sun Apr 21 18:10:16 2013 New Revision: 19545 URL: http://svn.gna.org/viewcvs/relax?rev=19545&view=rev Log: Merged revisions 19540-19544 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r19540 | bugman | 2013-04-21 16:36:02 +0200 (Sun, 21 Apr 2013) | 5 lines Created the gui.wizards package for holding all of the relax wizards. The gui.wizard module is now called gui.wizards.wiz_objects. ........ r19541 | bugman | 2013-04-21 17:13:55 +0200 (Sun, 21 Apr 2013) | 3 lines Import fix for the GUI test suite. ........ r19542 | bugman | 2013-04-21 17:15:56 +0200 (Sun, 21 Apr 2013) | 3 lines More import fixes for the GUI test suite. ........ r19543 | bugman | 2013-04-21 17:18:10 +0200 (Sun, 21 Apr 2013) | 7 lines Shifted and merged the NOE and Rx peak intensity wizards into a new module. The wizards were separate and a part of the analysis frame class objects. The two wizards have been merged into the gui.wizards.peak_intensity.Peak_intensity_wizard class as most of the code is shared. This one wizard class will be useful for reusing in the relaxation dispersion branch. ........ r19544 | bugman | 2013-04-21 18:05:41 +0200 (Sun, 21 Apr 2013) | 6 lines The peak intensity wizard class now inherits from Wiz_window. This allows the class to be a wizard window instead of launching a wizard window from within the class. ........ Added: branches/relax_disp/gui/wizards/ - copied from r19544, trunk/gui/wizards/ Removed: branches/relax_disp/gui/wizard.py Modified: branches/relax_disp/ (props changed) branches/relax_disp/gui/analyses/auto_model_free.py branches/relax_disp/gui/analyses/auto_noe.py branches/relax_disp/gui/analyses/auto_rx_base.py branches/relax_disp/gui/analyses/base.py branches/relax_disp/gui/analyses/wizard.py branches/relax_disp/gui/components/free_file_format.py branches/relax_disp/gui/components/relax_data.py branches/relax_disp/gui/spin_viewer/frame.py branches/relax_disp/gui/uf_objects.py branches/relax_disp/test_suite/gui_tests/base_classes.py branches/relax_disp/test_suite/gui_tests/model_free.py branches/relax_disp/test_suite/gui_tests/noe.py branches/relax_disp/test_suite/gui_tests/rx.py branches/relax_disp/test_suite/gui_tests/state.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/relax_disp/gui/analyses/auto_model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_model_free.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/gui/analyses/auto_noe.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_noe.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/gui/analyses/auto_rx_base.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_rx_base.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/gui/analyses/base.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/base.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/gui/analyses/wizard.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/wizard.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/gui/components/free_file_format.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/components/free_file_format.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/gui/components/relax_data.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/components/relax_data.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/gui/spin_viewer/frame.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/spin_viewer/frame.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/gui/uf_objects.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/uf_objects.py?rev=19545&r1=19544&r2=19545&view=diff Removed: branches/relax_disp/gui/wizard.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/wizard.py?rev=19544&view=auto Modified: branches/relax_disp/test_suite/gui_tests/base_classes.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/base_classes.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/test_suite/gui_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/model_free.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/test_suite/gui_tests/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/noe.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/test_suite/gui_tests/rx.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/rx.py?rev=19545&r1=19544&r2=19545&view=diff Modified: branches/relax_disp/test_suite/gui_tests/state.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/state.py?rev=19545&r1=19544&r2=19545&view=diff