Author: bugman Date: Wed Mar 26 23:00:31 2014 New Revision: 22557 URL: http://svn.gna.org/viewcvs/relax?rev=22557&view=rev Log: Merged revisions 22556 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r22556 | bugman | 2014-03-26 23:00:04 +0100 (Wed, 26 Mar 2014) | 5 lines The legends in Grace plots are now turned on by default, if the legend flags are not specified. The Noe.test_noe_analysis system test has been updated for the change. ........ Modified: branches/double_rotor/ (props changed) branches/double_rotor/lib/software/grace.py branches/double_rotor/test_suite/system_tests/noe.py Propchange: branches/double_rotor/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Wed Mar 26 23:00:31 2014 @@ -1 +1 @@ -/trunk:1-22554 +/trunk:1-22556 Modified: branches/double_rotor/lib/software/grace.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/lib/software/grace.py?rev=22557&r1=22556&r2=22557&view=diff ============================================================================== --- branches/double_rotor/lib/software/grace.py (original) +++ branches/double_rotor/lib/software/grace.py Wed Mar 26 23:00:31 2014 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2003-2013 Edward d'Auvergne # +# Copyright (C) 2003-2014 Edward d'Auvergne # # Copyright (C) 2013 Troels E. Linnet # # # # This file is part of the program relax (http://www.nmr-relax.com). # @@ -301,6 +301,10 @@ norm = [] for gi in range(graph_num): norm.append(False) + if legend == None: + legend = [] + for gi in range(graph_num): + legend.append(True) if not legend_box_fill_pattern: legend_box_fill_pattern = [] for gi in range(graph_num): Modified: branches/double_rotor/test_suite/system_tests/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/noe.py?rev=22557&r1=22556&r2=22557&view=diff ============================================================================== --- branches/double_rotor/test_suite/system_tests/noe.py (original) +++ branches/double_rotor/test_suite/system_tests/noe.py Wed Mar 26 23:00:31 2014 @@ -190,7 +190,7 @@ '@ yaxis tick minor linewidth 0.5\n', '@ yaxis tick minor size 0.25\n', '@ yaxis ticklabel char size 0.70\n', - '@ legend off\n', + '@ legend on\n', '@ legend box fill pattern 1\n', '@ legend char size 1.0\n', '@ frame linewidth 0.5\n', @@ -247,7 +247,7 @@ '@ yaxis tick minor linewidth 0.5\n', '@ yaxis tick minor size 0.25\n', '@ yaxis ticklabel char size 0.70\n', - '@ legend off\n', + '@ legend on\n', '@ legend box fill pattern 1\n', '@ legend char size 1.0\n', '@ frame linewidth 0.5\n',