[hg] galaxy 3168: Update the output test dataset for the XY_Plot...
endobj @@ -17,23 +17,15 @@ endobj 5 0 obj << -/Type /Font -/Subtype /Type1 -/Name /F1 -/BaseFont /ZapfDingbats +/Type /Page +/Parent 3 0 R +/Contents 6 0 R +/Resources 4 0 R
endobj 6 0 obj << -/Type /Page -/Parent 3 0 R -/Contents 7 0 R -/Resources 4 0 R ->> -endobj -7 0 obj -<< -/Length 8 0 R +/Length 7 0 R
stream q @@ -44,86 +36,104 @@ 1 J 1 j 10.00 M -106.99 73.44 m 389.07 73.44 l S -106.99 73.44 m 106.99 66.24 l S -177.51 73.44 m 177.51 66.24 l S -248.03 73.44 m 248.03 66.24 l S -318.55 73.44 m 318.55 66.24 l S -389.07 73.44 m 389.07 66.24 l S +117.07 73.44 m 458.40 73.44 l S +117.07 73.44 m 117.07 66.24 l S +202.40 73.44 m 202.40 66.24 l S +287.73 73.44 m 287.73 66.24 l S +373.07 73.44 m 373.07 66.24 l S +458.40 73.44 m 458.40 66.24 l S BT 0.000 0.000 0.000 rg -/F2 1 Tf 12.00 0.00 -0.00 12.00 103.66 47.52 Tm (2) Tj -/F2 1 Tf 12.00 0.00 -0.00 12.00 174.18 47.52 Tm (4) Tj -/F2 1 Tf 12.00 0.00 -0.00 12.00 244.69 47.52 Tm (6) Tj -/F2 1 Tf 12.00 0.00 -0.00 12.00 315.21 47.52 Tm (8) Tj -/F2 1 Tf 12.00 0.00 -0.00 12.00 382.39 47.52 Tm (10) Tj +/F2 1 Tf 12.00 0.00 -0.00 12.00 113.73 47.52 Tm (2) Tj ET -59.04 117.16 m 59.04 361.87 l S -59.04 117.16 m 51.84 117.16 l S -59.04 198.73 m 51.84 198.73 l S -59.04 280.30 m 51.84 280.30 l S -59.04 361.87 m 51.84 361.87 l S BT -/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 110.49 Tm (60) Tj -/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 192.06 Tm (65) Tj -/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 273.63 Tm (70) Tj -/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 355.19 Tm (75) Tj +/F2 1 Tf 12.00 0.00 -0.00 12.00 199.06 47.52 Tm (4) Tj +ET +BT +/F2 1 Tf 12.00 0.00 -0.00 12.00 284.40 47.52 Tm (6) Tj +ET +BT +/F2 1 Tf 12.00 0.00 -0.00 12.00 369.73 47.52 Tm (8) Tj +ET +BT +/F2 1 Tf 12.00 0.00 -0.00 12.00 451.73 47.52 Tm (10) Tj +ET +59.04 127.67 m 59.04 431.20 l S +59.04 127.67 m 51.84 127.67 l S +59.04 228.85 m 51.84 228.85 l S +59.04 330.02 m 51.84 330.02 l S +59.04 431.20 m 51.84 431.20 l S +BT +/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 121.00 Tm (60) Tj +ET +BT +/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 222.18 Tm (65) Tj +ET +BT +/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 323.35 Tm (70) Tj +ET +BT +/F2 1 Tf 0.00 12.00 -12.00 0.00 41.76 424.53 Tm (75) Tj ET 59.04 73.44 m -401.76 73.44 l -401.76 372.96 l -59.04 372.96 l +473.76 73.44 l +473.76 444.96 l +59.04 444.96 l 59.04 73.44 l S Q q BT 0.000 0.000 0.000 rg -/F3 1 Tf 14.00 0.00 -0.00 14.00 175.16 397.45 Tm (Example XY Plot) Tj -/F2 1 Tf 12.00 0.00 -0.00 12.00 204.73 18.72 Tm (Column 1) Tj -/F2 1 Tf 0.00 12.00 -12.00 0.00 12.96 197.53 Tm (Column 2) Tj +/F3 1 Tf 14.00 0.00 -0.00 14.00 211.16 469.45 Tm (Example XY Plot) Tj ET -Q q 59.04 73.44 342.72 299.52 re W n +BT +/F2 1 Tf 12.00 0.00 -0.00 12.00 240.73 18.72 Tm (Column 1) Tj +ET +BT +/F2 1 Tf 0.00 12.00 -12.00 0.00 12.96 233.53 Tm (Column 2) Tj +ET +Q q 59.04 73.44 414.72 371.52 re W n 1.000 0.000 0.000 RG 0.75 w [ 3.00 5.00] 0 d 1 J 1 j 10.00 M -71.73 247.67 m -106.99 296.61 l -142.25 149.79 l -177.51 361.87 l -212.77 84.53 l -248.03 117.16 l -283.29 231.36 l -318.55 247.67 l -353.81 296.61 l -389.07 263.98 l +74.40 289.55 m +117.07 350.26 l +159.73 168.14 l +202.40 431.20 l +245.07 87.20 l +287.73 127.67 l +330.40 269.32 l +373.07 289.55 l +415.73 350.26 l +458.40 309.79 l S Q endstream endobj -8 0 obj -1503 +7 0 obj +1557 endobj 3 0 obj << /Type /Pages /Kids [ -6 0 R +5 0 R ] /Count 1 -/MediaBox [0 0 432 432] +/MediaBox [0 0 504 504]
endobj 4 0 obj << /ProcSet [/PDF /Text] -/Font << /F1 5 0 R /F2 10 0 R /F3 11 0 R >> +/Font <</F2 9 0 R /F3 10 0 R >> /ExtGState << >>
endobj -9 0 obj +8 0 obj << /Type /Encoding /BaseEncoding /WinAnsiEncoding @@ -132,40 +142,39 @@ /dieresis /.notdef /ring /cedilla /.notdef /hungarumlaut /ogonek /caron /space]
endobj -10 0 obj << +9 0 obj << /Type /Font /Subtype /Type1 /Name /F2 /BaseFont /Helvetica -/Encoding 9 0 R +/Encoding 8 0 R
endobj -11 0 obj << +10 0 obj << /Type /Font /Subtype /Type1 /Name /F3 /BaseFont /Helvetica-Bold -/Encoding 9 0 R +/Encoding 8 0 R endobj xref -0 12 +0 11 0000000000 65535 f 0000000021 00000 n -0000000163 00000 n -0000001951 00000 n -0000002034 00000 n -0000000212 00000 n -0000000295 00000 n -0000000375 00000 n -0000001931 00000 n -0000002138 00000 n -0000002395 00000 n -0000002492 00000 n +0000000164 00000 n +0000001923 00000 n +0000002006 00000 n +0000000213 00000 n +0000000293 00000 n +0000001903 00000 n +0000002098 00000 n +0000002355 00000 n +0000002451 00000 n
details: http://www.bx.psu.edu/hg/galaxy/rev/5da33678347e changeset: 3168:5da33678347e user: Greg Von Kuster <greg@bx.psu.edu> date: Thu Dec 10 09:18:49 2009 -0500 description: Update the output test dataset for the XY_Plot_1 tool due to a new version of R, and update the tool version so the functional test will pass. diffstat: test-data/XY_Plot_1_out.pdf | 163 +++++++++++++++++++++------------------- tools/plotting/xy_plot.xml | 2 +- 2 files changed, 87 insertions(+), 78 deletions(-) diffs (262 lines): diff -r 7e1e7c5d8dbe -r 5da33678347e test-data/XY_Plot_1_out.pdf --- a/test-data/XY_Plot_1_out.pdf Wed Dec 09 18:50:12 2009 -0500 +++ b/test-data/XY_Plot_1_out.pdf Thu Dec 10 09:18:49 2009 -0500 @@ -1,11 +1,11 @@ -%PDF-1.1 +%PDF-1.4 %âãÏÓ\r 1 0 obj << -/CreationDate (D:20081107092106) -/ModDate (D:20081107092106) +/CreationDate (D:20091210085012) +/ModDate (D:20091210085012) /Title (R Graphics Output) -/Producer (R 2.6.2) +/Producer (R 2.10.0) /Creator (R) trailer << -/Size 12 +/Size 11 /Info 1 0 R /Root 2 0 R
startxref -2594 +2553 %%EOF diff -r 7e1e7c5d8dbe -r 5da33678347e tools/plotting/xy_plot.xml --- a/tools/plotting/xy_plot.xml Wed Dec 09 18:50:12 2009 -0500 +++ b/tools/plotting/xy_plot.xml Thu Dec 10 09:18:49 2009 -0500 @@ -1,4 +1,4 @@ -<tool id="XY_Plot_1" name="Plotting tool"> +<tool id="XY_Plot_1" name="Plotting tool" version="1.0.1"> <description>for multiple series and graph types</description> <command interpreter="bash">r_wrapper.sh $script_file</command>
participants (1)
-
Greg Von Kuster