Author: bugman Date: Wed Feb 3 18:29:39 2010 New Revision: 10632 URL: http://svn.gna.org/viewcvs/relax?rev=10632&view=rev Log: Merged revisions 10611-10612,10626-10631 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r10611 | bugman | 2010-02-01 23:36:57 +0100 (Mon, 01 Feb 2010) | 5 lines Bug fix for the running of the test suite. The interpreter _on() and _off() methods are now called on() and off()! ........ r10612 | bugman | 2010-02-02 00:19:55 +0100 (Tue, 02 Feb 2010) | 3 lines Switched from using a cone angle to using an order parameter in the isotropic cone frame order model. ........ r10626 | bugman | 2010-02-03 11:22:00 +0100 (Wed, 03 Feb 2010) | 5 lines Added the stub function maths_fns.order_parameters.iso_cone_S_to_cos_theta(). This will be used to convert the order parameter S into the cosine of the cone angle. ........ r10627 | bugman | 2010-02-03 18:00:17 +0100 (Wed, 03 Feb 2010) | 16 lines Redesigned get_intro_string() to return a container of different strings. The method is now called get_intro_text() and returns a container with the following str objects: - title: The program title 'relax' - version: For example 'repository checkout' or '1.3.8'. - desc: The short program description. - copyright: A list of copyright statements. - licence: Text pertaining to the licencing. - errors: A list of import errors. This is being abstracted so that the different UIs can use this differently. The prompt/script can word wrap to 100 char (80 char in Windows), and print this to stdout. The GUI can use this in the about prompt and not print to stdout. Other interfaces can use this in any other way. And the information content can be expanded for different purposes. ........ r10628 | bugman | 2010-02-03 18:09:01 +0100 (Wed, 03 Feb 2010) | 6 lines Shifted the introductory text object into its own module. This makes the use of this object more flexible as anything and any part of the program can import it. ........ r10629 | bugman | 2010-02-03 18:15:59 +0100 (Wed, 03 Feb 2010) | 5 lines Shifted the spacing() method from relax to the intro module and renamed it to centre(). The docstring has also been expanded to include epydoc tags. ........ r10630 | bugman | 2010-02-03 18:26:28 +0100 (Wed, 03 Feb 2010) | 6 lines The introductory text for the prompt/script based interface is now recreated. The _build_intro_text() method has been added to replicate the formatting of the deleted get_intro_text() method of the main relax class. This formatting is only to be used in these 2 UIs. ........ r10631 | bugman | 2010-02-03 18:28:49 +0100 (Wed, 03 Feb 2010) | 7 lines Changed the program description again. The program is now described as "Molecular dynamics by NMR data analysis". This takes into account that this is for proteins, RNA, DNA, organic molecules, sugars, etc., and for relaxation data, RDCs, PCSs, NOEs, and all NMR data. ........ Added: branches/bieri_gui/intro.py - copied unchanged from r10631, 1.3/intro.py branches/bieri_gui/maths_fns/order_parameters.py - copied unchanged from r10631, 1.3/maths_fns/order_parameters.py Modified: branches/bieri_gui/ (props changed) branches/bieri_gui/maths_fns/__init__.py branches/bieri_gui/maths_fns/frame_order.py branches/bieri_gui/maths_fns/frame_order_matrix_ops.py branches/bieri_gui/prompt/interpreter.py branches/bieri_gui/relax branches/bieri_gui/specific_fns/frame_order.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/bieri_gui/maths_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/maths_fns/__init__.py?rev=10632&r1=10631&r2=10632&view=diff Modified: branches/bieri_gui/maths_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/maths_fns/frame_order.py?rev=10632&r1=10631&r2=10632&view=diff Modified: branches/bieri_gui/maths_fns/frame_order_matrix_ops.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/maths_fns/frame_order_matrix_ops.py?rev=10632&r1=10631&r2=10632&view=diff Modified: branches/bieri_gui/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/interpreter.py?rev=10632&r1=10631&r2=10632&view=diff Modified: branches/bieri_gui/relax URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/relax?rev=10632&r1=10631&r2=10632&view=diff Modified: branches/bieri_gui/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/frame_order.py?rev=10632&r1=10631&r2=10632&view=diff