Author: bugman
Date: Wed Aug 21 16:24:53 2013
New Revision: 20670
URL: http://svn.gna.org/viewcvs/relax?rev=20670&view=rev
Log:
Merged revisions 20655-20669 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r20655 | bugman | 2013-08-21 10:28:17 +0200 (Wed, 21 Aug 2013) | 6 lines
Created the Chemical_shift.test_read_sparky system test for the reading of
chemical shifts.
This is for the reading of shifts from a Sparky peak list. It tests the
currently non-existent
chemical_shift.read user function.
........
r20656 | bugman | 2013-08-21 11:04:28 +0200 (Wed, 21 Aug 2013) | 5 lines
Created some incredibly basic icons for the chemical shift user functions.
These are simply an omega symbol and will need to be replaced by something
better in the future.
........
r20657 | bugman | 2013-08-21 11:43:00 +0200 (Wed, 21 Aug 2013) | 5 lines
Created the chemical_shift.read user function.
This includes both the front and back end code.
........
r20658 | bugman | 2013-08-21 14:20:32 +0200 (Wed, 21 Aug 2013) | 3 lines
Removed an unused import.
........
r20659 | bugman | 2013-08-21 14:21:51 +0200 (Wed, 21 Aug 2013) | 6 lines
Shifted all the modules from lib.software to do with peak lists to
lib.spectrum.
This is for a more logical organisation, as these modules are solely used
by the
lib.spectrum.peak_list module.
........
r20660 | bugman | 2013-08-21 14:24:38 +0200 (Wed, 21 Aug 2013) | 6 lines
Renamed all of read_*() functions of the lib.spectrum modules for
consistency.
These functions will now be used to read all types of data from a peak
list, from the assignments
to chemical shifts to peak intensites, and everything in between.
........
r20661 | bugman | 2013-08-21 14:31:03 +0200 (Wed, 21 Aug 2013) | 6 lines
Modified the peak list object.
The peak list dimensionality variable is no longer private, and many values
of None are now
converted to lists of None so that the peak list data is easier to handle.
........
r20662 | bugman | 2013-08-21 14:32:18 +0200 (Wed, 21 Aug 2013) | 3 lines
Missing imports for the new pipe_control.chemical_shift module.
........
r20663 | bugman | 2013-08-21 14:33:15 +0200 (Wed, 21 Aug 2013) | 3 lines
Fix for the proton name in the new Chemical_shift.test_read_sparky system
test.
........
r20664 | bugman | 2013-08-21 15:08:03 +0200 (Wed, 21 Aug 2013) | 8 lines
Expanded the functionality of the lib.spectrum.sparky.read_list() function.
Now the dimensionality of the peak list is automatically determined, and
all peak lists from 1D to
4D are supported. The chemical shifts are also automatically detected and
extracted from the list
and placed into the peak list object. The peak intensity data is also
automatically detected,
therefore the int_col argument is no longer used.
........
r20665 | bugman | 2013-08-21 15:10:50 +0200 (Wed, 21 Aug 2013) | 3 lines
The lib.spectrum.sparky.read_list() function can now auto-detect the peak
volume column and use it for intensities.
........
r20666 | bugman | 2013-08-21 16:12:46 +0200 (Wed, 21 Aug 2013) | 5 lines
Created the Chemical_shift.test_read_xeasy system test.
This is for checking the reading of chemical shifts from a 2D XEasy peak
list.
........
r20667 | bugman | 2013-08-21 16:13:22 +0200 (Wed, 21 Aug 2013) | 3 lines
Implemented the reading of chemical shifts in the
lib.spectrum.xeasy.read_list() function.
........
r20668 | bugman | 2013-08-21 16:18:17 +0200 (Wed, 21 Aug 2013) | 6 lines
Created the Chemical_shift.test_read_nmrview system test.
This, if not obvious from the name, is for checking the reading of chemical
shifts from an NMRView
peak list.
........
r20669 | bugman | 2013-08-21 16:23:15 +0200 (Wed, 21 Aug 2013) | 3 lines
Implemented the reading of chemical shifts in the
lib.spectrum.nmrview.read_list() function.
........
Added:
branches/relax_disp/graphics/relax_icons/128x128/chemical_shift.eps.gz
- copied unchanged from r20669,
trunk/graphics/relax_icons/128x128/chemical_shift.eps.gz
branches/relax_disp/graphics/relax_icons/128x128/chemical_shift.png
- copied unchanged from r20669,
trunk/graphics/relax_icons/128x128/chemical_shift.png
branches/relax_disp/graphics/relax_icons/16x16/chemical_shift.png
- copied unchanged from r20669,
trunk/graphics/relax_icons/16x16/chemical_shift.png
branches/relax_disp/graphics/relax_icons/22x22/chemical_shift.png
- copied unchanged from r20669,
trunk/graphics/relax_icons/22x22/chemical_shift.png
branches/relax_disp/graphics/relax_icons/32x32/chemical_shift.png
- copied unchanged from r20669,
trunk/graphics/relax_icons/32x32/chemical_shift.png
branches/relax_disp/graphics/relax_icons/48x48/chemical_shift.png
- copied unchanged from r20669,
trunk/graphics/relax_icons/48x48/chemical_shift.png
branches/relax_disp/graphics/relax_icons/png/chemical_shift/
- copied from r20669, trunk/graphics/relax_icons/png/chemical_shift/
branches/relax_disp/lib/spectrum/nmrpipe.py
- copied unchanged from r20669, trunk/lib/spectrum/nmrpipe.py
branches/relax_disp/lib/spectrum/nmrview.py
- copied unchanged from r20669, trunk/lib/spectrum/nmrview.py
branches/relax_disp/lib/spectrum/sparky.py
- copied unchanged from r20669, trunk/lib/spectrum/sparky.py
branches/relax_disp/lib/spectrum/xeasy.py
- copied unchanged from r20669, trunk/lib/spectrum/xeasy.py
branches/relax_disp/pipe_control/chemical_shift.py
- copied unchanged from r20669, trunk/pipe_control/chemical_shift.py
branches/relax_disp/test_suite/system_tests/chemical_shift.py
- copied unchanged from r20669,
trunk/test_suite/system_tests/chemical_shift.py
branches/relax_disp/user_functions/chemical_shift.py
- copied unchanged from r20669, trunk/user_functions/chemical_shift.py
Removed:
branches/relax_disp/lib/software/nmrpipe.py
branches/relax_disp/lib/software/nmrview.py
branches/relax_disp/lib/software/sparky.py
branches/relax_disp/lib/software/xeasy.py
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/lib/software/__init__.py
branches/relax_disp/lib/spectrum/__init__.py
branches/relax_disp/lib/spectrum/objects.py
branches/relax_disp/lib/spectrum/peak_list.py
branches/relax_disp/pipe_control/__init__.py
branches/relax_disp/pipe_control/spectrum.py
branches/relax_disp/test_suite/system_tests/__init__.py
branches/relax_disp/user_functions/__init__.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/relax_disp/lib/software/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/software/__init__.py?rev=20670&r1=20669&r2=20670&view=diff
Removed: branches/relax_disp/lib/software/nmrpipe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/software/nmrpipe.py?rev=20669&view=auto
Removed: branches/relax_disp/lib/software/nmrview.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/software/nmrview.py?rev=20669&view=auto
Removed: branches/relax_disp/lib/software/sparky.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/software/sparky.py?rev=20669&view=auto
Removed: branches/relax_disp/lib/software/xeasy.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/software/xeasy.py?rev=20669&view=auto
Modified: branches/relax_disp/lib/spectrum/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/spectrum/__init__.py?rev=20670&r1=20669&r2=20670&view=diff
Modified: branches/relax_disp/lib/spectrum/objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/spectrum/objects.py?rev=20670&r1=20669&r2=20670&view=diff
Modified: branches/relax_disp/lib/spectrum/peak_list.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/spectrum/peak_list.py?rev=20670&r1=20669&r2=20670&view=diff
Modified: branches/relax_disp/pipe_control/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/__init__.py?rev=20670&r1=20669&r2=20670&view=diff
Modified: branches/relax_disp/pipe_control/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/spectrum.py?rev=20670&r1=20669&r2=20670&view=diff
Modified: branches/relax_disp/test_suite/system_tests/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/__init__.py?rev=20670&r1=20669&r2=20670&view=diff
Modified: branches/relax_disp/user_functions/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/__init__.py?rev=20670&r1=20669&r2=20670&view=diff
r20670 - in /branches/relax_disp: ./ graphics/relax_icons/128x128/ graphics/relax_icons/16x16/ graphics/relax_icons/22x22/ g...