/hg/gfx-test: Six new test cases added for antialiased lines - d...

[ptisnovs at icedtea.classpath.org]

changeset e6366a474636 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=e6366a474636
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Sep 30 11:32:12 2010 +0200

	Six new test cases added for antialiased lines - drawing color wheel
	(longer lines at different slope) and special cases (very short
	lines with different slope)


diffstat:

2 files changed, 101 insertions(+), 2 deletions(-)
src/org/gfxtest/ImageDiffer/ImageComparator.java |    5 +
src/org/gfxtest/testsuites/AALines.java          |   98 +++++++++++++++++++++-

diffs (143 lines):

diff -r 1ddd66f68390 -r e6366a474636 src/org/gfxtest/ImageDiffer/ImageComparator.java
--- a/src/org/gfxtest/ImageDiffer/ImageComparator.java	Wed Sep 29 15:10:29 2010 +0200
+++ b/src/org/gfxtest/ImageDiffer/ImageComparator.java	Thu Sep 30 11:32:12 2010 +0200
@@ -45,6 +45,11 @@ import java.awt.Point;
 import java.awt.Point;
 import java.awt.image.BufferedImage;
 
+/**
+ * Comparation of two images according to given comparation parameters.
+ *
+ * @author Pavel Tisnovsky
+ */
 public class ImageComparator
 {
     private void updateBoundary(Point min, Point max, int x, int y)
diff -r 1ddd66f68390 -r e6366a474636 src/org/gfxtest/testsuites/AALines.java
--- a/src/org/gfxtest/testsuites/AALines.java	Wed Sep 29 15:10:29 2010 +0200
+++ b/src/org/gfxtest/testsuites/AALines.java	Thu Sep 30 11:32:12 2010 +0200
@@ -63,7 +63,13 @@ public class AALines extends GfxTest
         img.setRGB(x2, y2, 0xff0000);
     }
 
-    private void drawHorizontalJaggedLines(BufferedImage image, Graphics2D graphics)
+    /**
+     * Draws various horizontal lines with endpoints having theirs y-coordinates changed by +- one pixel.
+     *
+     * @param image
+     * @param graphics
+     */
+    private static void drawHorizontalJaggedLines(BufferedImage image, Graphics2D graphics)
     {
         drawLine(image, graphics,  3,  3, 36,  4, Color.BLACK);
         drawLine(image, graphics,  3,  9, 36, 10, Color.YELLOW);
@@ -72,13 +78,61 @@ public class AALines extends GfxTest
         drawLine(image, graphics,  3, 26, 36, 25, Color.GRAY);
     }
 
-    private void drawVerticalJaggedLines(BufferedImage image, Graphics2D graphics)
+    /**
+     * Draws various vertical lines with endpoints having theirs x-coordinates changed by +- one pixel.
+     *
+     * @param image
+     * @param graphics
+     */
+    private static void drawVerticalJaggedLines(BufferedImage image, Graphics2D graphics)
     {
         drawLine(image, graphics,  3, 3,  4, 26, Color.BLACK);
         drawLine(image, graphics, 11, 3, 12, 26, Color.YELLOW);
         drawLine(image, graphics, 19, 3, 20, 26, Color.MAGENTA);
         drawLine(image, graphics, 27, 3, 28, 26, Color.BLUE);
         drawLine(image, graphics, 35, 3, 34, 26, Color.GRAY);
+    }
+
+    private static void drawColorWheel(BufferedImage image, Graphics2D graphics)
+    {
+        int xc = image.getWidth() >> 1;
+        int yc = image.getHeight() >> 1;
+        for (int i = 0; i < ANGLES; i++)
+        {
+            Color color = new Color(Color.HSBtoRGB((float)i/ANGLES, 1.0f, 1.0f));
+            graphics.setColor(color);
+            int majorRadius = (xc > yc ? yc : xc) - 2;
+            double angle = 2.0 * i / ANGLES * Math.PI;
+            double cos = Math.cos(angle);
+            double sin = Math.sin(angle);
+            int x1 = xc + (int)(6.0*cos);
+            int y1 = yc + (int)(6.0*sin);
+            int x2 = xc + (int)(majorRadius*cos);
+            int y2 = yc + (int)(majorRadius*sin);
+            drawLine(image, graphics, x1, y1, x2, y2, color);
+        }
+    }
+
+    /**
+     * Draws special types of lines - very short ones with different angles
+     * @param image
+     * @param graphics
+     */
+    private static void drawSpecialCases(BufferedImage image, Graphics2D graphics)
+    {
+        int y1 = 2;
+        for (int j = 0; j < 5; j++)
+        {
+            int x1 = 2;
+            int y2 = y1 + j;
+            for (int i = 0; i < 6; i++)
+            {
+                int x2 = x1 + i;
+                drawLine(image, graphics, x1, y1, x2, y2, Color.BLACK);
+                x1 = x2 + 4;
+            }
+            y1 = y2 + 4;
+        }
     }
 
     private void setAA1(Graphics2D graphics)
@@ -132,6 +186,46 @@ public class AALines extends GfxTest
         return TestResult.PASSED;
     }
 
+    public TestResult testColorWheelNoAA(TestImage image, Graphics2D graphics)
+    {
+        drawColorWheel(image.getImage(), graphics);
+        return TestResult.PASSED;
+    }
+
+    public TestResult testColorWheelAA1(TestImage image, Graphics2D graphics)
+    {
+        setAA1(graphics);
+        drawColorWheel(image.getImage(), graphics);
+        return TestResult.PASSED;
+    }
+
+    public TestResult testColorWheelAA2(TestImage image, Graphics2D graphics)
+    {
+        setAA2(graphics);
+        drawColorWheel(image.getImage(), graphics);
+        return TestResult.PASSED;
+    }
+
+    public TestResult testSpecialCasesNoAA(TestImage image, Graphics2D graphics)
+    {
+        drawSpecialCases(image.getImage(), graphics);
+        return TestResult.PASSED;
+    }
+
+    public TestResult testSpecialCasesAA1(TestImage image, Graphics2D graphics)
+    {
+        setAA1(graphics);
+        drawSpecialCases(image.getImage(), graphics);
+        return TestResult.PASSED;
+    }
+
+    public TestResult testSpecialCasesAA2(TestImage image, Graphics2D graphics)
+    {
+        setAA2(graphics);
+        drawSpecialCases(image.getImage(), graphics);
+        return TestResult.PASSED;
+    }
+
     public static void main(String[] args)
     {
         new AALines().runTestSuite(args);