Author: bugman
Date: Wed May 28 17:32:30 2014
New Revision: 23536
URL: http://svn.gna.org/viewcvs/relax?rev=23536&view=rev
Log:
Merged revisions 23506-23508 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
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.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py
branches/frame_order_cleanup/user_functions/dx.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 28 17:32:30 2014
@@ -1 +1 @@
-/trunk:1-23493,23495-23500,23505
+/trunk:1-23493,23495-23500,23505-23508
Modified:
branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py?rev=23536&r1=23535&r2=23536&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py
(original)
+++ branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py
Wed May 28 17:32:30 2014
@@ -141,6 +141,7 @@
# GUI data checks for the rotation matrix.
R = uf.page.uf_args['R'].GetValue()
+ print("Rotation matrix:\n%s" % R)
self.assertEqual(len(R), 3)
self.assertEqual(len(R[0]), 3)
self.assertEqual(R[0][0], 1)
@@ -153,6 +154,27 @@
self.assertEqual(R[2][1], 0)
self.assertEqual(R[2][2], 1)
+ # Set the rotation matrix to nothing, and check what happens.
+ uf.page.uf_args['R'].SetValue(str_to_gui(''))
+ uf.page.uf_args['R'].selection_win_show()
+ uf.page.uf_args['R'].sel_win.sequence.SetStringItem(index=1, col=1,
label=int_to_gui(2))
+ uf.page.uf_args['R'].selection_win_data()
+
+ # GUI data checks for the rotation matrix.
+ R = uf.page.uf_args['R'].GetValue()
+ print("Rotation matrix:\n%s" % R)
+ self.assertEqual(len(R), 3)
+ self.assertEqual(len(R[0]), 3)
+ self.assertEqual(R[0][0], 0)
+ self.assertEqual(R[0][1], 0)
+ self.assertEqual(R[0][2], 0)
+ self.assertEqual(R[1][0], 0)
+ self.assertEqual(R[1][1], 2)
+ self.assertEqual(R[1][2], 0)
+ self.assertEqual(R[2][0], 0)
+ self.assertEqual(R[2][1], 0)
+ self.assertEqual(R[2][2], 0)
+
# Check the structural data.
self.assert_(hasattr(cdp, 'structure'))
self.assert_(hasattr(cdp.structure, 'structural_data'))
Modified: branches/frame_order_cleanup/user_functions/dx.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/dx.py?rev=23536&r1=23535&r2=23536&view=diff
==============================================================================
--- branches/frame_order_cleanup/user_functions/dx.py (original)
+++ branches/frame_order_cleanup/user_functions/dx.py Wed May 28 17:32:30
2014
@@ -177,7 +177,7 @@
desc_short = "highlight points in the space",
desc = "This argument allows specific points in the optimisation space
to be displayed as coloured spheres. This can be used to highlight a minimum
or other any other feature of the space. Either a single point or a list of
points can be supplied. Each point is a list of floating point numbers in
the form [x, y, z]",
can_be_none = True,
- dim = (3, 3)
+ dim = (None, 4)
)
uf.add_keyarg(
name = "point_file",
r23536 - in /branches/frame_order_cleanup: ./ test_suite/gui_tests/test_user_functions.py user_functions/dx.py