Author: bugman
Date: Fri Feb 21 17:14:59 2014
New Revision: 22242
URL: http://svn.gna.org/viewcvs/relax?rev=22242&view=rev
Log:
Merged revisions 22219-22239 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22219 | bugman | 2014-02-20 10:39:34 +0100 (Thu, 20 Feb 2014) | 5 lines
Expanded the relaxation dispersion GUI tutorial in the manual.
This now includes the first steps for loading the peak intensity data.
........
r22220 | tlinnet | 2014-02-20 18:15:43 +0100 (Thu, 20 Feb 2014) | 3 lines
Added the The relaxation time period to be used when returning cpmg frqs.
Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG
analysis with two fields at two delay times.
........
r22221 | tlinnet | 2014-02-20 18:16:39 +0100 (Thu, 20 Feb 2014) | 3 lines
Added test for skipping non-matching time points.
Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG
analysis with two fields at two delay times.
........
r22222 | tlinnet | 2014-02-20 18:16:51 +0100 (Thu, 20 Feb 2014) | 3 lines
Switched the looping over time points and dispersion points.
Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG
analysis with two fields at two delay times.
........
r22223 | tlinnet | 2014-02-20 18:17:00 +0100 (Thu, 20 Feb 2014) | 3 lines
Added the time point to be sent into the return function of cpmg
frequencies.
Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG
analysis with two fields at two delay times.
........
r22224 | tlinnet | 2014-02-20 18:17:11 +0100 (Thu, 20 Feb 2014) | 3 lines
Improved unit test for cathing both time and dispersion point when looping
over experiment and time points.
Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG
analysis with two fields at two delay times.
........
r22225 | bugman | 2014-02-21 09:08:05 +0100 (Fri, 21 Feb 2014) | 5 lines
Modified the spectrum.read_intensities user function frontend to load
multiple files.
This follows from the thread
http://thread.gmane.org/gmane.science.nmr.relax.devel/5057/focus=5062.
........
r22226 | bugman | 2014-02-21 09:16:36 +0100 (Fri, 21 Feb 2014) | 20 lines
Implemented the GUI element for loading multiple files.
This follows from the thread
http://thread.gmane.org/gmane.science.nmr.relax.devel/5057/focus=5062.
This is via the new user function argument type "file sel multi", now used
by the
spectrum.read_intensities user function. The file selection element
consists of two parts. The GUI
element embedded in the user function wizard page is similar to the "file
sel" element, except that
the preview button is not present. The file selection button behaviour is
also different in that it
launches the new multiple file selection window.
The multiple file selection window is based on the 'sequence' data window,
as used in the spectrum
ID argument for the spectrum.read_intensities user function. However the
ListCtrl element has been
replaced by a custom scrolled panel. The 'Add' button adds a new file
selection GUI element
consisting of a TextCtrl for displaying and manual editing of the file
name, the file selection
button for launching the relax file selection dialog, and the preview
button lost in the parent GUI
element. The scrolled panel allows more elements in the panel than can
fit in the window. The
'Delete all' and 'OK' buttons from the 'sequence' data window are also
present and function as
expected.
........
r22227 | bugman | 2014-02-21 09:29:43 +0100 (Fri, 21 Feb 2014) | 8 lines
Modification of the new multiple file selection GUI element.
The multiple file selection window now shows the index (plus one) of each
file selection element at
the front of that element. This way the user can easily see how many file
elements there are and
can match file names to numbers. This will help in making sure that the
file names and spectrum ID
elements correspond to each other.
........
r22228 | bugman | 2014-02-21 09:38:48 +0100 (Fri, 21 Feb 2014) | 7 lines
Added a 'Delete' button to the new multiple file selection GUI window.
This simply deletes the last item in the list. This will be useful if the
user clicks on the 'Add'
button too many times - instead of clicking 'Delete all' and having to
re-select all files, now the
last element can be removed.
........
r22229 | bugman | 2014-02-21 10:00:01 +0100 (Fri, 21 Feb 2014) | 8 lines
Improved the behaviour of the multiple file selection GUI window.
The RelaxFileDialog GUI element is now initialised when the file selection
button is clicked rather
than in the __init__() method. The result of this change is that the
current working directory is
dynamically changed in the RelaxFileDialog, hence if the directory is
changed in one file selection
element, it will look like it is changed in all.
........
r22230 | bugman | 2014-02-21 10:00:22 +0100 (Fri, 21 Feb 2014) | 3 lines
Small spacing fix.
........
r22231 | bugman | 2014-02-21 10:22:46 +0100 (Fri, 21 Feb 2014) | 6 lines
Renamed the test_loop_exp_time() dispersion unit test to
test_loop_exp_frq_offset_point_time().
This is for the
specific_analyses.relax_disp.disp_data.Test_disp_data.test_loop_exp_frq_offset_point_time()
unit test. The name better reflects the function being tested.
........
r22232 | bugman | 2014-02-21 10:35:04 +0100 (Fri, 21 Feb 2014) | 7 lines
Created the test_loop_exp_frq() dispersion unit test.
This checks the operation of the loop_exp_frq() function from the module
specific_analyses.relax_disp.disp_data. It uses the data attached to the
bug report at
https://gna.org/bugs/?21665.
........
r22233 | bugman | 2014-02-21 11:21:25 +0100 (Fri, 21 Feb 2014) | 5 lines
Fixes for the unit tests of the spectrum.read_intensities user function.
A number of checks were not correctly set up, and the recent changes caused
others to now fail.
........
r22234 | bugman | 2014-02-21 11:40:22 +0100 (Fri, 21 Feb 2014) | 8 lines
Modified the GUI window for inputting sequence data to include item numbers.
An non-editable initial column with the number of each item has been added.
This is to help the
user when, for example, the items of one sequence element should match
another (for example in the
spectrum.read_intensities user function where multiple file names should
match multiple spectrum
IDs).
........
r22235 | bugman | 2014-02-21 13:49:13 +0100 (Fri, 21 Feb 2014) | 7 lines
Added a 'Delete' button to the sequence input GUI window.
This is to match the multiple file selection GUI window. The button allows
the user to delete the
last item from the list. So if 'Add' has been clicked too many times, the
user does not have to
start again from scratch by clicking on 'Delete all'.
........
r22236 | bugman | 2014-02-21 13:49:48 +0100 (Fri, 21 Feb 2014) | 3 lines
Removed a debugging printout statement accidentally committed at r22235.
........
r22237 | bugman | 2014-02-21 14:19:37 +0100 (Fri, 21 Feb 2014) | 5 lines
More modifications to the sequence input GUI window to match the multiple
file selection element.
The window now starts with a single element rather than nothing.
........
r22238 | bugman | 2014-02-21 16:08:36 +0100 (Fri, 21 Feb 2014) | 5 lines
Continued expanding the tutorial for performing a relaxation dispersion
analysis in the GUI.
This is for the dispersion chapter of the manual.
........
r22239 | bugman | 2014-02-21 16:12:03 +0100 (Fri, 21 Feb 2014) | 6 lines
Created the Peak_lists.test_read_peak_list_sparky_double system test.
This is used to test the loading of multiple files simultaneously by the
spectrum.read_intensities
user function.
........
Added:
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_file_selection.eps.gz
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_file_selection.eps.gz
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_file_selection.png
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_file_selection.png
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_file_selection_fin.eps.gz
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_file_selection_fin.eps.gz
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_file_selection_fin.png
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_file_selection_fin.png
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_incomplete_setup.eps.gz
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_incomplete_setup.eps.gz
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_incomplete_setup.png
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_incomplete_setup.png
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_spectrum_ids.eps.gz
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_spectrum_ids.eps.gz
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_spectrum_ids.png
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_spectrum_ids.png
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_spin_name.eps.gz
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_spin_name.eps.gz
branches/double_rotor/graphics/screenshots/dispersion_analysis/spectrum_spin_name.png
- copied unchanged from r22239,
trunk/graphics/screenshots/dispersion_analysis/spectrum_spin_name.png
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/docs/latex/dispersion.tex
branches/double_rotor/gui/input_elements/file.py
branches/double_rotor/gui/input_elements/sequence.py
branches/double_rotor/gui/uf_objects.py
branches/double_rotor/specific_analyses/relax_disp/disp_data.py
branches/double_rotor/test_suite/system_tests/peak_lists.py
branches/double_rotor/test_suite/unit_tests/_prompt/test_spectrum.py
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
branches/double_rotor/user_functions/spectrum.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/double_rotor/docs/latex/dispersion.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/docs/latex/dispersion.tex?rev=22242&r1=22241&r2=22242&view=diff
Modified: branches/double_rotor/gui/input_elements/file.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/gui/input_elements/file.py?rev=22242&r1=22241&r2=22242&view=diff
Modified: branches/double_rotor/gui/input_elements/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/gui/input_elements/sequence.py?rev=22242&r1=22241&r2=22242&view=diff
Modified: branches/double_rotor/gui/uf_objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/gui/uf_objects.py?rev=22242&r1=22241&r2=22242&view=diff
Modified: branches/double_rotor/specific_analyses/relax_disp/disp_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/disp_data.py?rev=22242&r1=22241&r2=22242&view=diff
Modified: branches/double_rotor/test_suite/system_tests/peak_lists.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/peak_lists.py?rev=22242&r1=22241&r2=22242&view=diff
Modified: branches/double_rotor/test_suite/unit_tests/_prompt/test_spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/unit_tests/_prompt/test_spectrum.py?rev=22242&r1=22241&r2=22242&view=diff
Modified:
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py?rev=22242&r1=22241&r2=22242&view=diff
Modified: branches/double_rotor/user_functions/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/spectrum.py?rev=22242&r1=22241&r2=22242&view=diff
r22242 - in /branches/double_rotor: ./ docs/latex/ graphics/screenshots/dispersion_analysis/ gui/ gui/input_elements/ specif...