Author: bugman
Date: Tue Jul 9 12:08:35 2013
New Revision: 20262
URL: http://svn.gna.org/viewcvs/relax?rev=20262&view=rev
Log:
Merged revisions 20247-20257,20260-20261 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r20247 | bugman | 2013-06-21 17:28:04 +0200 (Fri, 21 Jun 2013) | 8 lines
Adding a test data file in NMRPipe SeriesTab format.
Progress sr #3043: (https://gna.org/support/index.php?3043) - Support for
NMRPipe seriesTab format
*.ser.
A file in NMRPipe SeriesTab format is added to the test-suite for further
development.
........
r20248 | bugman | 2013-06-21 18:23:24 +0200 (Fri, 21 Jun 2013) | 9 lines
Test function for NMRPipe SeriesTab format implemented.
Progress sr #3043: (https://gna.org/support/index.php?3043) - Support for
NMRPipe seriesTab format
*.ser.
An assertEqual test is implemented for the reading of NMRPipe SeriesTab
format. The standalone call
is: relax -s Peak_lists.test_read_peak_list_NMRPipe_seriesTab
........
r20249 | bugman | 2013-06-21 18:33:03 +0200 (Fri, 21 Jun 2013) | 9 lines
Adding a NMRPipe function file in the folder lib\software\nmrpipe.py.
Progress sr #3043: (https://gna.org/support/index.php?3043) - Support for
NMRPipe seriesTab format
*.ser.
Initial file for: lib\software\nmrpipe.py. This file will hold the function
calls handling NMRPipe
SeriesTab format.
........
r20250 | bugman | 2013-06-21 19:46:58 +0200 (Fri, 21 Jun 2013) | 9 lines
Fix for commit
(http://article.gmane.org/gmane.science.nmr.relax.scm/18004). The spin naming
was wrong.
Progress sr #3043: (https://gna.org/support/index.php?3043) - Support for
NMRPipe seriesTab format
*.ser.
The spin naming was wrong. 'spin_id' keywords should be supplied different.
Ex:
spin.name(name='NE1', spin_id=':62').
........
r20251 | bugman | 2013-06-21 20:01:06 +0200 (Fri, 21 Jun 2013) | 9 lines
Autodetect format implemented for NMRPipe SeriesTab format implemented.
Progress sr #3043: (https://gna.org/support/index.php?3043) - Support for
NMRPipe seriesTab format
*.ser.
The file is determined a NMRPipe SeriesTab if the first two words of the
first line is: REMARK
SeriesTab.
........
r20252 | bugman | 2013-06-21 22:26:18 +0200 (Fri, 21 Jun 2013) | 6 lines
Update of the rotation matrix example in the intro chapter of the user
manual.
The function is now in lib.geometry.rotations.euler_to_R_zyz(). The
example has also been converted
to the lstlisting environment for better formatting.
........
r20253 | bugman | 2013-06-21 22:48:44 +0200 (Fri, 21 Jun 2013) | 6 lines
The relax prompt strings and help system are now keywords for the relax
listings package definition.
The prompt strings "relax>" and "relax|" are now recognised as keywords and
are coloured blue. The
help system has been added as a normal Python keyword for highlighting.
........
r20254 | bugman | 2013-06-21 23:40:55 +0200 (Fri, 21 Jun 2013) | 5 lines
Converted all relax prompt examples in the intro chapter of the manual to
the lstlisting environment.
This is simply for a more colourful representation.
........
r20255 | bugman | 2013-06-22 00:45:10 +0200 (Sat, 22 Jun 2013) | 6 lines
The prompt examples in the user function chapter of the manual now use the
listing environment.
This is via the fetch_docstrings.py script and results in much better
formatting of these
subsections.
........
r20256 | bugman | 2013-06-24 12:29:40 +0200 (Mon, 24 Jun 2013) | 9 lines
Added function destination for auto-detected NMRPipe SeriesTab format.
Progress sr #3043: (https://gna.org/support/index.php?3043) - Support for
NMRPipe seriesTab format
*.ser.
Auto-detected NMRPipe SeriesTab format make function calls to the file:
lib\software\nmrpipe.py in
function nmrpipe.read_list_intensity_seriestab().
........
r20257 | bugman | 2013-06-24 14:58:23 +0200 (Mon, 24 Jun 2013) | 8 lines
Imported the missing lib.software.nmrpipe module into pipe_control.spectrum.
Progress sr #3043: (https://gna.org/support/index.php?3043) - Support for
NMRPipe seriesTab format
*.ser.
Expected modules for use in lib\software\nmrpipe.py is imported.
........
r20260 | bugman | 2013-07-09 11:35:34 +0200 (Tue, 09 Jul 2013) | 6 lines
Fix for the relax GUI splash screen.
On certain systems, the GUI was failing due to the splash screen. It is
now shown after the main
wxPython window has been created.
........
r20261 | bugman | 2013-07-09 11:37:34 +0200 (Tue, 09 Jul 2013) | 6 lines
Fix for the new analysis wizard when running the GUI tests.
If the create_button() method is called without a function argument, the
wizard is still created.
This is triggered in the relax_disp branch on certain systems.
........
Added:
branches/relax_disp/lib/software/nmrpipe.py
- copied unchanged from r20261, trunk/lib/software/nmrpipe.py
branches/relax_disp/test_suite/shared_data/peak_lists/seriesTab.ser
- copied unchanged from r20261,
trunk/test_suite/shared_data/peak_lists/seriesTab.ser
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/docs/latex/fetch_docstrings.py
branches/relax_disp/docs/latex/intro.tex
branches/relax_disp/docs/latex/relax.tex
branches/relax_disp/gui/__init__.py
branches/relax_disp/gui/analyses/wizard.py
branches/relax_disp/pipe_control/spectrum.py
branches/relax_disp/test_suite/system_tests/peak_lists.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/relax_disp/docs/latex/fetch_docstrings.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/fetch_docstrings.py?rev=20262&r1=20261&r2=20262&view=diff
Modified: branches/relax_disp/docs/latex/intro.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/intro.tex?rev=20262&r1=20261&r2=20262&view=diff
Modified: branches/relax_disp/docs/latex/relax.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/relax.tex?rev=20262&r1=20261&r2=20262&view=diff
Modified: branches/relax_disp/gui/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/__init__.py?rev=20262&r1=20261&r2=20262&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=20262&r1=20261&r2=20262&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=20262&r1=20261&r2=20262&view=diff
Modified: branches/relax_disp/test_suite/system_tests/peak_lists.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/peak_lists.py?rev=20262&r1=20261&r2=20262&view=diff
r20262 - in /branches/relax_disp: ./ docs/latex/ gui/ gui/analyses/ lib/software/ pipe_control/ test_suite/shared_data/peak_...