changeset 25556:1246bc23416f

8041902: When printing, polylines are not rendered as joined Reviewed-by: bae, jgodinez
author prr
date Thu, 26 Jun 2014 16:10:33 -0700
parents b70a66b5b942
children f9cb8492293a
files jdk/src/share/classes/sun/print/PathGraphics.java jdk/test/java/awt/print/PrinterJob/PolylinePrintingTest.java
diffstat 2 files changed, 231 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/share/classes/sun/print/PathGraphics.java	Thu Jun 26 13:46:27 2014 -0700
+++ b/jdk/src/share/classes/sun/print/PathGraphics.java	Thu Jun 26 16:10:33 2014 -0700
@@ -43,6 +43,7 @@
 import java.awt.Polygon;
 import java.awt.Shape;
 
+import java.awt.geom.Path2D;
 import java.text.AttributedCharacterIterator;
 
 import java.awt.font.FontRenderContext;
@@ -457,23 +458,18 @@
      */
     public void drawPolyline(int xPoints[], int yPoints[],
                              int nPoints) {
-        float fromX;
-        float fromY;
-        float toX;
-        float toY;
 
-        if (nPoints > 0) {
-            fromX = xPoints[0];
-            fromY = yPoints[0];
+        if (nPoints == 2) {
+            draw(new Line2D.Float(xPoints[0], yPoints[0],
+                                  xPoints[1], yPoints[1]));
+        } else if (nPoints > 2) {
+            Path2D path = new Path2D.Float(Path2D.WIND_EVEN_ODD, nPoints);
+            path.moveTo(xPoints[0], yPoints[0]);
             for(int i = 1; i < nPoints; i++) {
-                toX = xPoints[i];
-                toY = yPoints[i];
-                draw(new Line2D.Float(fromX, fromY, toX, toY));
-                fromX = toX;
-                fromY = toY;
+                path.lineTo(xPoints[i], yPoints[i]);
             }
+            draw(path);
         }
-
     }
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/print/PrinterJob/PolylinePrintingTest.java	Thu Jun 26 16:10:33 2014 -0700
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @bug 8041902
+ * @summary Test printing of wide poly lines.
+ * @run main/manual=yesno PolylinePrintingTest
+ */
+
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.TextArea;
+import java.awt.BasicStroke;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.Path2D;
+import java.awt.print.PageFormat;
+import java.awt.print.Paper;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+
+public class PolylinePrintingTest implements Printable {
+
+    public int print(Graphics graphics, PageFormat pageFormat,
+                     int pageIndex) throws PrinterException {
+
+        if (pageIndex > 0) {
+            return NO_SUCH_PAGE;
+        }
+
+        Graphics2D g2d = (Graphics2D) graphics;
+        g2d.setStroke(new BasicStroke(25,
+                                      BasicStroke.CAP_ROUND,
+                                      BasicStroke.JOIN_MITER,
+                                      10.0F, null, 1.0F));
+
+        int[] x2Points = {100, 250, 400};
+        int[] y2Points = {100, 400, 100};
+        drawPolylineGOOD(g2d, x2Points, y2Points);
+        drawPolylineBAD(g2d, x2Points, y2Points);
+
+        return PAGE_EXISTS;
+    }
+
+    private void drawPolylineGOOD(Graphics2D g2d,
+                                  int[] x2Points, int[] y2Points) {
+
+        Path2D polyline =
+            new Path2D.Float(Path2D.WIND_EVEN_ODD, x2Points.length);
+
+        polyline.moveTo(x2Points[0], y2Points[0]);
+
+        for (int index = 1; index < x2Points.length; index++) {
+                polyline.lineTo(x2Points[index], y2Points[index]);
+        }
+        g2d.draw(polyline);
+    }
+
+    private void drawPolylineBAD(Graphics2D g, int[] xp, int[] yp) {
+        int offset = 200;
+        g.translate(0, offset);
+        g.drawPolyline(xp, yp, xp.length);
+    }
+
+    public PolylinePrintingTest() throws PrinterException {
+        PrinterJob job = PrinterJob.getPrinterJob();
+        PageFormat pf = job.defaultPage();
+        Paper p = pf.getPaper();
+        p.setImageableArea(0,0,p.getWidth(), p.getHeight());
+        pf.setPaper(p);
+        job.setPrintable(this, pf);
+        if (job.printDialog()) {
+            job.print();
+        }
+    }
+
+    public static void main(String[] args) throws PrinterException {
+        String[] instructions = {
+             "You must have a printer available to perform this test.",
+             "OK the print dialog, and collect the printed page.",
+             "Passing test : Output should show two identical chevrons.",
+             "Failing test : The line joins will appear different."
+           };
+        Sysout.createDialog();
+        Sysout.printInstructions(instructions);
+        new PolylinePrintingTest();
+    }
+}
+
+class Sysout {
+   private static TestDialog dialog;
+
+   public static void createDialogWithInstructions( String[] instructions )
+    {
+      dialog = new TestDialog( new Frame(), "Instructions" );
+      dialog.printInstructions( instructions );
+      dialog.show();
+      println( "Any messages for the tester will display here." );
+    }
+
+   public static void createDialog( )
+    {
+      dialog = new TestDialog( new Frame(), "Instructions" );
+      String[] defInstr = { "Instructions will appear here. ", "" } ;
+      dialog.printInstructions( defInstr );
+      dialog.show();
+      println( "Any messages for the tester will display here." );
+    }
+
+
+   public static void printInstructions( String[] instructions )
+    {
+      dialog.printInstructions( instructions );
+    }
+
+
+   public static void println( String messageIn )
+    {
+      dialog.displayMessage( messageIn );
+    }
+
+}// Sysout  class
+
+/**
+  This is part of the standard test machinery.  It provides a place for the
+   test instructions to be displayed, and a place for interactive messages
+   to the user to be displayed.
+  To have the test instructions displayed, see Sysout.
+  To have a message to the user be displayed, see Sysout.
+  Do not call anything in this dialog directly.
+  */
+class TestDialog extends Dialog {
+  TextArea instructionsText;
+   TextArea messageText;
+   int maxStringLength = 80;
+
+   //DO NOT call this directly, go through Sysout
+   public TestDialog( Frame frame, String name )
+    {
+      super( frame, name );
+      int scrollBoth = TextArea.SCROLLBARS_BOTH;
+      instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+      add( "North", instructionsText );
+
+      messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+      add("Center", messageText);
+
+      pack();
+
+      show();
+    }// TestDialog()
+
+   //DO NOT call this directly, go through Sysout
+   public void printInstructions( String[] instructions )
+    {
+      //Clear out any current instructions
+      instructionsText.setText( "" );
+
+      //Go down array of instruction strings
+
+      String printStr, remainingStr;
+      for( int i=0; i < instructions.length; i++ )
+       {
+         //chop up each into pieces maxSringLength long
+         remainingStr = instructions[ i ];
+         while( remainingStr.length() > 0 )
+          {
+            //if longer than max then chop off first max chars to print
+            if( remainingStr.length() >= maxStringLength )
+             {
+               //Try to chop on a word boundary
+               int posOfSpace = remainingStr.
+                  lastIndexOf( ' ', maxStringLength - 1 );
+               if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+               printStr = remainingStr.substring( 0, posOfSpace + 1 );
+               remainingStr = remainingStr.substring( posOfSpace + 1 );
+             }
+            //else just print
+            else
+             {
+               printStr = remainingStr;
+               remainingStr = "";
+             }
+
+            instructionsText.append( printStr + "\n" );
+
+          }// while
+
+       }// for
+
+    }//printInstructions()
+
+   //DO NOT call this directly, go through Sysout
+   public void displayMessage( String messageIn )
+    {
+      messageText.append( messageIn + "\n" );
+    }
+
+}// TestDialog  class
+