Author: tlinnet
Date: Thu May 29 13:05:53 2014
New Revision: 23589
URL: http://svn.gna.org/viewcvs/relax?rev=23589&view=rev
Log:
Merged revisions 23551,23554-23562,23568,23571-23572,23574,23577-23579 via
svnmerge from
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk
........
r23551 | bugman | 2014-05-28 18:11:40 +0200 (Wed, 28 May 2014) | 11 lines
Fix for bug #22102, the point argument of the dx.map user function failing
in the GUI.
This is reported at https://gna.org/bugs/?22102.
The Sequence_2D GUI element used for all list of lists arguments in the
user function GUI windows
now correctly handles variable length lists. The first column which shows
a count of the elements
is now properly taken into account in the SetValue(), GetValue() and
add_item() methods, via a new
self.offset variable. The self.variable_length variable has also been
fixed so it is not
overwritten by the parent Sequence GUI element.
........
r23554 | bugman | 2014-05-28 18:24:57 +0200 (Wed, 28 May 2014) | 5 lines
Increased the width of the first column of the Sequence_2D GUI element for
variable lists.
This is so the column title "Number" will fit.
........
r23555 | bugman | 2014-05-28 18:26:19 +0200 (Wed, 28 May 2014) | 6 lines
Added list titles for the dx.map user function point argument.
This is so that the Sequence_2D GUI element will have column titles of 'X
coordinate',
'Y coordinate', and 'Z coordinate'.
........
r23556 | bugman | 2014-05-28 18:35:34 +0200 (Wed, 28 May 2014) | 3 lines
The self.variable_length flag is now used throughout the Sequence GUI
element.
........
r23557 | bugman | 2014-05-28 18:38:29 +0200 (Wed, 28 May 2014) | 3 lines
The self.variable_length flag is used in one more spot in the Sequence_2D
GUI element.
........
r23558 | bugman | 2014-05-28 18:59:17 +0200 (Wed, 28 May 2014) | 6 lines
Created the User_functions.test_structure_add_atom GUI test.
This is used to check the operation of the Sequence GUI element via the
'pos' argument of the
structure.add_atom user function. This is a list fixed to 3 elements.
........
r23559 | bugman | 2014-05-28 19:01:14 +0200 (Wed, 28 May 2014) | 5 lines
Titles are now handled and set in the Sequence GUI element.
The titles will replace the numbering of 1 onwards in the first column of
the GUI element.
........
r23560 | bugman | 2014-05-28 19:07:38 +0200 (Wed, 28 May 2014) | 3 lines
Small fix for switched indices in the new
User_functions.test_structure_add_atom GUI test.
........
r23561 | bugman | 2014-05-28 19:10:00 +0200 (Wed, 28 May 2014) | 6 lines
Modified the 'pos' argument of the structure.add_atom user function.
The argument is now a list of fixed length of 3, and it has the titles 'X
coordinate',
'Y coordinate', and 'Z coordinate' which are shown in the GUI.
........
r23562 | bugman | 2014-05-28 19:12:21 +0200 (Wed, 28 May 2014) | 7 lines
Bug fixes for the Sequence GUI element used for lists in the user function
windows.
Invalid values input into the Sequence GUI window are now ignored rather
than raising different
types of error. And invalid input lists for fixed dimension arguments are
also ignored. This
allows the User_functions.test_structure_add_atom GUI test to pass.
........
r23568 | bugman | 2014-05-28 19:21:59 +0200 (Wed, 28 May 2014) | 6 lines
Bug fix for the lib.arg_check.is_float_object() function.
The dim argument can sometimes be an integer rather than a tuple, but this
was not handled by the
function. Now integer dim arguments are pre-converted to lists before
performing all the checks.
........
r23571 | bugman | 2014-05-28 20:25:54 +0200 (Wed, 28 May 2014) | 8 lines
Created the User_functions.test_spectrum_read_intensities GUI test to catch
bug #22105.
This is reported at https://gna.org/bugs/?22105.
The problem is that a single file name is split up into many files when the
file selection button
is clicked, one for each character of the file name.
........
r23572 | bugman | 2014-05-28 20:31:19 +0200 (Wed, 28 May 2014) | 5 lines
Fix for the User_functions.test_spectrum_read_intensities GUI test.
A valid value was being checked as invalid.
........
r23574 | bugman | 2014-05-28 20:33:22 +0200 (Wed, 28 May 2014) | 7 lines
Fix for bug #22105 (https://gna.org/bugs/?22105).
This is the failure spectrum.read_intensities GUI user function whereby a
file name is turned into
lists of characters. A few changes were made to allow the
Selector_file_multiple GUI element to
operate correctly.
........
r23577 | bugman | 2014-05-28 22:22:24 +0200 (Wed, 28 May 2014) | 6 lines
Shifted all wildcards used in GUI file selection dialogs into the new
user_functions.wildcard module.
These have now all been standardised, and expanded to include more
capitalisation combinations and
to include more *.* options.
........
r23578 | bugman | 2014-05-28 22:39:51 +0200 (Wed, 28 May 2014) | 5 lines
Created a file selection wildcard for use in the GUI for selecting peak
lists.
This is used in the four user functions which read peak lists.
........
r23579 | bugman | 2014-05-28 22:42:43 +0200 (Wed, 28 May 2014) | 3 lines
Changed all *.* GUI file selection wildcards to *.
........
Added:
branches/disp_speed/user_functions/wildcards.py
- copied unchanged from r23579, trunk/user_functions/wildcards.py
Modified:
branches/disp_speed/ (props changed)
branches/disp_speed/gui/input_elements/file.py
branches/disp_speed/gui/input_elements/sequence.py
branches/disp_speed/gui/input_elements/sequence_2D.py
branches/disp_speed/gui/uf_objects.py
branches/disp_speed/lib/arg_check.py
branches/disp_speed/test_suite/gui_tests/test_user_functions.py
branches/disp_speed/user_functions/__init__.py
branches/disp_speed/user_functions/chemical_shift.py
branches/disp_speed/user_functions/dx.py
branches/disp_speed/user_functions/frame_order.py
branches/disp_speed/user_functions/grace.py
branches/disp_speed/user_functions/molmol.py
branches/disp_speed/user_functions/n_state_model.py
branches/disp_speed/user_functions/objects.py
branches/disp_speed/user_functions/pcs.py
branches/disp_speed/user_functions/pymol_control.py
branches/disp_speed/user_functions/rdc.py
branches/disp_speed/user_functions/relax_disp.py
branches/disp_speed/user_functions/results.py
branches/disp_speed/user_functions/script.py
branches/disp_speed/user_functions/spectrum.py
branches/disp_speed/user_functions/state.py
branches/disp_speed/user_functions/structure.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/disp_speed/gui/input_elements/file.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/gui/input_elements/file.py?rev=23589&r1=23588&r2=23589&view=diff
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=23589&r1=23588&r2=23589&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=23589&r1=23588&r2=23589&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=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/lib/arg_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/arg_check.py?rev=23589&r1=23588&r2=23589&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=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/__init__.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/chemical_shift.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/chemical_shift.py?rev=23589&r1=23588&r2=23589&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=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/frame_order.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/grace.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/molmol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/molmol.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/n_state_model.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/objects.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/pcs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/pcs.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/pymol_control.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/pymol_control.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/rdc.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/rdc.py?rev=23589&r1=23588&r2=23589&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=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/results.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/script.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/script.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/spectrum.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/state.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/state.py?rev=23589&r1=23588&r2=23589&view=diff
Modified: branches/disp_speed/user_functions/structure.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/structure.py?rev=23589&r1=23588&r2=23589&view=diff
r23589 - in /branches/disp_speed: ./ gui/ gui/input_elements/ lib/ test_suite/gui_tests/ user_functions/