Author: bugman
Date: Fri Mar 8 15:33:31 2013
New Revision: 18705
URL: http://svn.gna.org/viewcvs/relax?rev=18705&view=rev
Log:
Merged revisions 18689-18704 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r18689 | bugman | 2013-03-08 10:04:47 +0100 (Fri, 08 Mar 2013) | 5 lines
Created the lib.text.table.MULTI_COL constant for defining cells spanning
multiple columns.
This is not used yet.
........
r18690 | bugman | 2013-03-08 10:12:21 +0100 (Fri, 08 Mar 2013) | 3 lines
Modified the Mf.test_mf_auto_analysis GUI test to catch bug #20603
(https://gna.org/bugs/?20603).
........
r18691 | bugman | 2013-03-08 10:17:09 +0100 (Fri, 08 Mar 2013) | 6 lines
Fix for bug 20603 (https://gna.org/bugs/?20603), the relaxation data right
click menu failure.
The problem was that there was that the last menu item specified had no
contents. This item has
been removed.
........
r18692 | bugman | 2013-03-08 10:20:41 +0100 (Fri, 08 Mar 2013) | 5 lines
Created a unit test for the lib.text.table.format_table() function to test
multiple column support.
Support for content spanning multiple cells is yet to be implemented.
........
r18693 | bugman | 2013-03-08 12:05:12 +0100 (Fri, 08 Mar 2013) | 3 lines
Implemented multi-column support in lib.text.table.format_table().
........
r18694 | bugman | 2013-03-08 12:36:39 +0100 (Fri, 08 Mar 2013) | 3 lines
Spacing between heading rows is now functional in
lib.text.table.format_table().
........
r18695 | bugman | 2013-03-08 12:48:26 +0100 (Fri, 08 Mar 2013) | 3 lines
Fix for calculating column widths when multi-column cells are present in
lib.text.table.format_table().
........
r18696 | bugman | 2013-03-08 14:13:49 +0100 (Fri, 08 Mar 2013) | 3 lines
Slight changes to one of the lib.text.table.format_table() unit tests.
........
r18697 | bugman | 2013-03-08 14:40:16 +0100 (Fri, 08 Mar 2013) | 3 lines
Created a new unit test of lib.text.table.format_table() to check for
non-string type data.
........
r18698 | bugman | 2013-03-08 14:43:46 +0100 (Fri, 08 Mar 2013) | 5 lines
The table contents are now all converted to strings in
lib.text.table.format_table().
This uses the _convert_to_string() private function.
........
r18699 | bugman | 2013-03-08 14:57:05 +0100 (Fri, 08 Mar 2013) | 5 lines
Converted the test_format_table4() unit test of
lib.text.table.format_table() to check justification.
The right justification of cells with numbers will be implemented to match
these changes.
........
r18700 | bugman | 2013-03-08 14:57:34 +0100 (Fri, 08 Mar 2013) | 3 lines
Numbers are now right justified in cells in the
lib.text.table.format_table() function.
........
r18701 | bugman | 2013-03-08 15:15:27 +0100 (Fri, 08 Mar 2013) | 6 lines
Modified the test_format_table4() unit test of
lib.text.table.format_table().
This change is to test the currently unimplemented custom_format argument.
This will be used to
allow special formatting in the table. For example using '%.3f' for a
float.
........
r18702 | bugman | 2013-03-08 15:16:34 +0100 (Fri, 08 Mar 2013) | 6 lines
Implemented the custom_format argument for lib.text.table.format_table().
This allows cell contents to be formatted as the user asks. It defaults to
standard string
conversion is the custom conversion fails.
........
r18703 | bugman | 2013-03-08 15:21:25 +0100 (Fri, 08 Mar 2013) | 3 lines
Rounding error fix for the test_format_table4() unit test of
lib.text.table.format_table().
........
r18704 | bugman | 2013-03-08 15:28:19 +0100 (Fri, 08 Mar 2013) | 5 lines
Python 3 fix for the test_format_table4() unit test of
lib.text.table.format_table().
The string representation of the builtin list object is different in Python
2 vs. 3.
........
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/gui/components/relax_data.py
branches/frame_order_testing/lib/text/table.py
branches/frame_order_testing/test_suite/gui_tests/model_free.py
branches/frame_order_testing/test_suite/unit_tests/_lib/_text/test_table.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/frame_order_testing/gui/components/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/components/relax_data.py?rev=18705&r1=18704&r2=18705&view=diff
Modified: branches/frame_order_testing/lib/text/table.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/lib/text/table.py?rev=18705&r1=18704&r2=18705&view=diff
Modified: branches/frame_order_testing/test_suite/gui_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/gui_tests/model_free.py?rev=18705&r1=18704&r2=18705&view=diff
Modified:
branches/frame_order_testing/test_suite/unit_tests/_lib/_text/test_table.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_lib/_text/test_table.py?rev=18705&r1=18704&r2=18705&view=diff
r18705 - in /branches/frame_order_testing: ./ gui/components/ lib/text/ test_suite/gui_tests/ test_suite/unit_tests/_lib/_text/