Author: tlinnet
Date: Wed May 28 11:34:56 2014
New Revision: 23501
URL: http://svn.gna.org/viewcvs/relax?rev=23501&view=rev
Log:
Merged revisions 23488,23490-23493,23495-23500 via svnmerge from
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk
........
r23488 | bugman | 2014-05-28 08:59:22 +0200 (Wed, 28 May 2014) | 5 lines
Modified the frame order constraints so that cone_theta_x <= cone_theta_y.
The linear_constraints() function docstring has been updated to include
this constraint.
........
r23490 | tlinnet | 2014-05-28 10:25:14 +0200 (Wed, 28 May 2014) | 1 line
Set dim=4 when setting chi surface level in user function dx.map.
........
r23491 | bugman | 2014-05-28 10:31:49 +0200 (Wed, 28 May 2014) | 5 lines
Fix for the n_state_model.cone_pdb user function for the recent internal
structural object changes.
The cone arguments should now be called cone_obj.
........
r23492 | bugman | 2014-05-28 10:39:21 +0200 (Wed, 28 May 2014) | 7 lines
Fix for the frame_order.pdb_model user function for the rotor models.
The rotor axis is no longer defined by spherical angles and therefore needs
to be recreated using
the create_rotor_axis_alpha() rather than create_rotor_axis_spherical()
function from
lib.frame_order.rotor_axis.
........
r23493 | bugman | 2014-05-28 11:05:16 +0200 (Wed, 28 May 2014) | 5 lines
Renamed the relax_disp.set_grid_r20_from_min_r2eff user function to
relax_disp.r20_from_min_r2eff.
This follows from the proposal at
http://thread.gmane.org/gmane.science.nmr.relax.devel/5957.
........
r23495 | bugman | 2014-05-28 11:19:56 +0200 (Wed, 28 May 2014) | 7 lines
Modification to the Sequence_2D GUI element used for some user function
windows.
The selection_win_show() method has been redefined, as the parent method
from the Sequence element
is specific for the 1D sequence module. The open_dialog() method has also
been modified to use the
new selection_win_show(), as well as the parent Sequence class
selection_win_data() method.
........
r23496 | bugman | 2014-05-28 11:26:48 +0200 (Wed, 28 May 2014) | 6 lines
Created the User_functions.test_structure_rotate GUI tests.
This is to catch bug #22100 (https://gna.org/bugs/?22100), the rotation
argument for the
structure.rotate user function cannot be changed in the GUI, as an
AttributeError is raised.
........
r23497 | tlinnet | 2014-05-28 11:28:30 +0200 (Wed, 28 May 2014) | 1 line
Moved py_type "list_val_or_list_of_list_val" to 2D sequence types.
........
r23498 | tlinnet | 2014-05-28 11:28:32 +0200 (Wed, 28 May 2014) | 1 line
Added dim dimensions to match the x,y,z positions for GUI input in user
function dx.map.
........
r23499 | bugman | 2014-05-28 11:29:57 +0200 (Wed, 28 May 2014) | 3 lines
Modified the User_functions.test_structure_rotate GUI test to change and
check the rotation matrix.
........
r23500 | bugman | 2014-05-28 11:31:19 +0200 (Wed, 28 May 2014) | 3 lines
Fixes for some big mistakes in the previous commit.
........
Modified:
branches/disp_speed/ (props changed)
branches/disp_speed/auto_analyses/relax_disp.py
branches/disp_speed/gui/input_elements/sequence_2D.py
branches/disp_speed/gui/uf_objects.py
branches/disp_speed/specific_analyses/frame_order/parameters.py
branches/disp_speed/specific_analyses/frame_order/uf.py
branches/disp_speed/specific_analyses/n_state_model/uf.py
branches/disp_speed/specific_analyses/relax_disp/data.py
branches/disp_speed/test_suite/gui_tests/test_user_functions.py
branches/disp_speed/test_suite/system_tests/relax_disp.py
branches/disp_speed/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py
branches/disp_speed/user_functions/dx.py
branches/disp_speed/user_functions/relax_disp.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/disp_speed/auto_analyses/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/auto_analyses/relax_disp.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/gui/input_elements/sequence_2D.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/gui/input_elements/sequence_2D.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/gui/uf_objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/gui/uf_objects.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/specific_analyses/frame_order/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/specific_analyses/frame_order/parameters.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/specific_analyses/frame_order/uf.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/specific_analyses/frame_order/uf.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/specific_analyses/n_state_model/uf.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/specific_analyses/n_state_model/uf.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/specific_analyses/relax_disp/data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/specific_analyses/relax_disp/data.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/test_suite/gui_tests/test_user_functions.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/gui_tests/test_user_functions.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/system_tests/relax_disp.py?rev=23501&r1=23500&r2=23501&view=diff
Modified:
branches/disp_speed/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/user_functions/dx.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/dx.py?rev=23501&r1=23500&r2=23501&view=diff
Modified: branches/disp_speed/user_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/relax_disp.py?rev=23501&r1=23500&r2=23501&view=diff
r23501 - in /branches/disp_speed: ./ auto_analyses/ gui/ gui/input_elements/ specific_analyses/frame_order/ specific_analyse...