Menu

Commit [r26074]  Maximize  Restore  History

Merged revisions 26044-26046,26048-26056 via svnmerge from

svn+ssh://bugman@.../svn/relax/trunk

........
r26044 | bugman | 2014-09-26 09:52:37 +0200 (Fri, 26 Sep 2014) | 7 lines

Created the pipe_control.spectrometer.check_setup() function.

This follows the design on the wiki page http://wiki.nmr-relax.com/Relax_source_design.

This is for checking if spectrometer information has been set up.
........
r26045 | bugman | 2014-09-26 09:55:10 +0200 (Fri, 26 Sep 2014) | 3 lines

Created the RelaxNoFrqWarning warning class for warning that no spectrometer information is present.
........
r26046 | bugman | 2014-09-26 10:00:58 +0200 (Fri, 26 Sep 2014) | 5 lines

Renamed the pipe_control.spectrometer.check_setup() function to check_spectrometer_setup().

This is so it can be used without confusion outside of the module.
........
r26048 | bugman | 2014-09-26 10:05:42 +0200 (Fri, 26 Sep 2014) | 3 lines

Fix for a broken elif block in the new pipe_control.spectrometer.check_spectrometer_setup() function.
........
r26049 | bugman | 2014-09-26 10:06:58 +0200 (Fri, 26 Sep 2014) | 5 lines

The model-free bmrb_write() API method now checks for spectrometer information.

This is via a call to the pipe_control.spectrometer.check_spectrometer_setup() function.
........
r26050 | bugman | 2014-09-26 10:09:18 +0200 (Fri, 26 Sep 2014) | 3 lines

Modified the Bmrb.test_bug_22703_display_empty system/GUI test to catch the RelaxNoFrqError.
........
r26051 | bugman | 2014-09-26 11:31:29 +0200 (Fri, 26 Sep 2014) | 6 lines

Created a special Check class based on the strategy design pattern.

This is in the new lib.checks module. The class will be used to simplify and unify all of the
check_*() functions in the pipe_control and specific_analyses packages.
........
r26052 | bugman | 2014-09-26 11:43:15 +0200 (Fri, 26 Sep 2014) | 6 lines

Converted the pipe_control.spectrometer.check_*() functions to the strategy design pattern.

These are now passed into the lib.checks.Check object, and the original functions are now instances
of this class.
........
r26053 | bugman | 2014-09-26 11:44:00 +0200 (Fri, 26 Sep 2014) | 5 lines

Updated the Bmrb.test_bug_22703_display_empty system/GUI test.

The RelaxError type is now different.
........
r26054 | bugman | 2014-09-26 12:15:23 +0200 (Fri, 26 Sep 2014) | 3 lines

Alphabetical ordering of all functions in the pipe_control.pipes module.
........
r26055 | bugman | 2014-09-26 12:40:16 +0200 (Fri, 26 Sep 2014) | 9 lines

Changed the design of the Check object in lib.checks.

The design of the checking function to call has been modified - it should now return either None if
the check passes or an instantiated RelaxError object if not. This is then used to determine if the
__call__() method should return True (when None is received). Otherwise if escalate is set to 1,
the text from the RelaxError object is sent into a RelaxWarning and False is returned. And if
escalate is set to 2, then the error object is simply raised.
........
r26056 | bugman | 2014-09-26 12:41:06 +0200 (Fri, 26 Sep 2014) | 3 lines

Updated the pipe_control.spectrometer.check_*_func() functions to use the new design.
........

bugman 2014-09-26

changed /branches/frame_order_cleanup
changed /branches/frame_order_cleanup/lib/__init__.py
changed /branches/frame_order_cleanup/lib/warnings.py
changed /branches/frame_order_cleanup/pipe_control/pipes.py
changed /branches/frame_order_cleanup/pipe_control/spectrometer.py
changed /branches/frame_order_cleanup/specific_analyses/model_free/api.py
changed /branches/frame_order_cleanup/test_suite/system_tests/bmrb.py
copied /trunk/lib/checks.py -> /branches/frame_order_cleanup/lib/checks.py
/branches/frame_order_cleanup/lib/__init__.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_cleanup/lib/warnings.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_cleanup/pipe_control/pipes.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_cleanup/pipe_control/spectrometer.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_cleanup/specific_analyses/model_free/api.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_cleanup/test_suite/system_tests/bmrb.py Diff Switch to side-by-side view
Loading...
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.