Author: tlinnet
Date: Wed May 28 17:33:45 2014
New Revision: 23538
URL: http://svn.gna.org/viewcvs/relax?rev=23538&view=rev
Log:
Merged revisions 23505-23521,23532 via svnmerge from
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk
........
r23505 | bugman | 2014-05-28 11:58:29 +0200 (Wed, 28 May 2014) | 6 lines
Some more fixes for the User_functions.test_structure_rotate GUI test.
The open_dialog() method cannot be used, as it deletes the window at the
end. Instead the
selection_win_show() and selection_win_data() method combination is used.
........
r23506 | bugman | 2014-05-28 12:04:15 +0200 (Wed, 28 May 2014) | 5 lines
Expanded the User_functions.test_structure_rotate GUI test.
This is to more extensively check the 'float_matrix' user function argument
type in the GUI.
........
r23507 | tlinnet | 2014-05-28 12:04:27 +0200 (Wed, 28 May 2014) | 3 lines
Modified the dim dimensions to (None, 3) to allow the user to change number
of points in the GUI.
This is for the user function dx.map.
........
r23508 | tlinnet | 2014-05-28 12:09:37 +0200 (Wed, 28 May 2014) | 5 lines
Modified the dim dimensions to (None, 4) to allow the user to change number
of points in the GUI.
THe first dimension was used as a counter, the last 3 dimensions is for
x,y,z position.
This is for the user function dx.map.
........
r23509 | bugman | 2014-05-28 12:15:10 +0200 (Wed, 28 May 2014) | 8 lines
Partial fix for bug #22100.
This is the bug report at 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.
The append_row() method call has been replaced by the correct add_element()
call.
........
r23510 | bugman | 2014-05-28 14:01:13 +0200 (Wed, 28 May 2014) | 5 lines
Simplified the User_functions GUI tests.
The exec_uf_pipe_create() method has been created to simplify the data pipe
creation in the tests.
........
r23511 | bugman | 2014-05-28 14:25:20 +0200 (Wed, 28 May 2014) | 7 lines
Expanded the User_functions.test_structure_rotate GUI test.
The rotation matrix argument checks for the Sequence_2D GUI element have
been expanded to check that
setting nothing (blank element) returns nothing (None). The other checks
have also been slightly
modified.
........
r23512 | bugman | 2014-05-28 14:36:46 +0200 (Wed, 28 May 2014) | 6 lines
Expanded the User_functions.test_structure_rotate GUI test to catch more
problems.
Now the rotation matrix value in the user function window is set to a
series of invalid values to
test if the Sequence_2D GUI element will handle the rubbish input. This is
to mimic user errors.
........
r23513 | bugman | 2014-05-28 14:39:27 +0200 (Wed, 28 May 2014) | 7 lines
Bug fix for the Sequence_2D GUI element.
This is used for the user function windows in the GUI for setting lists of
lists or matrices. The
GUI element GetValue() method will now return None if nothing is set. This
prevents a list of lists
of None being added to the main user function window.
........
r23514 | tlinnet | 2014-05-28 15:05:21 +0200 (Wed, 28 May 2014) | 17 lines
Reverted r23508-23507 as the correct is dimensions (None, 3) for x,y,x
positions.
The command used was:
svn merge -r23508:23507 .
.....
Modified the dim dimensions to (None, 4) to allow the user to change
number of points in the GUI.
THe first dimension was used as a counter, the last 3 dimensions is for
x,y,z position.
This is for the user function dx.map.
Modified:
trunk/user_functions/dx.py
.....
........
r23515 | bugman | 2014-05-28 15:32:39 +0200 (Wed, 28 May 2014) | 3 lines
Created the is_list() and is_list_of_lists() functions for the
lib.check_types module.
........
r23516 | bugman | 2014-05-28 15:34:19 +0200 (Wed, 28 May 2014) | 3 lines
Copyright update.
........
r23517 | bugman | 2014-05-28 15:40:32 +0200 (Wed, 28 May 2014) | 6 lines
Clean up of the User_functions.test_structure_rotate GUI test.
The invalid value check is simpler and the Sequence_2D GUI object return
value is now checked to be
None.
........
r23518 | bugman | 2014-05-28 15:45:36 +0200 (Wed, 28 May 2014) | 7 lines
Expanded the User_functions.test_structure_rotate GUI once more.
This time the setting of invalid values in the Sequence_2D element itself
is now checked. For
example for the rotation matrix of the structure.rotate user function, if a
matrix element is set to
a string, a NameError is raised.
........
r23519 | bugman | 2014-05-28 15:48:29 +0200 (Wed, 28 May 2014) | 7 lines
Fixes for the Sequence and Sequence_2D GUI elements for handling invalid
input data.
These elements used by the user function windows previously raised all
sorts of errors if the data
was not what they expected (lists or lists of lists respectively). These
situations are now caught
and the input data is ignored, so blank Sequence and Sequence_2D elements
are presented to the user.
........
r23520 | bugman | 2014-05-28 16:04:38 +0200 (Wed, 28 May 2014) | 7 lines
Bug fix for the Sequence_2D GUI element.
This is used for handling list of lists user function arguments in the user
function GUI windows.
The setting of invalid values directly in the Sequence_2D GUI element is
now detected. These values
are now replaced with None.
........
r23521 | bugman | 2014-05-28 16:32:01 +0200 (Wed, 28 May 2014) | 7 lines
Created the User_functions.test_dx_map GUI test.
This extensively checks the 'point' argument for the dx.map user function
GUI window. This is to
catch bug #22102 (https://gna.org/bugs/?22102), the point argument of the
dx.map user function being
incorrect in the GUI.
........
r23532 | bugman | 2014-05-28 17:00:48 +0200 (Wed, 28 May 2014) | 3 lines
Modified the User_functions.test_dx_map GUI test to catch another problem
with the Sequence_2D element.
........
Modified:
branches/disp_speed/ (props changed)
branches/disp_speed/gui/input_elements/sequence.py
branches/disp_speed/gui/input_elements/sequence_2D.py
branches/disp_speed/lib/check_types.py
branches/disp_speed/test_suite/gui_tests/test_user_functions.py
branches/disp_speed/user_functions/dx.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/disp_speed/gui/input_elements/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/gui/input_elements/sequence.py?rev=23538&r1=23537&r2=23538&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=23538&r1=23537&r2=23538&view=diff
Modified: branches/disp_speed/lib/check_types.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/check_types.py?rev=23538&r1=23537&r2=23538&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=23538&r1=23537&r2=23538&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=23538&r1=23537&r2=23538&view=diff
r23538 - in /branches/disp_speed: ./ gui/input_elements/ lib/ test_suite/gui_tests/ user_functions/