This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.awt.geom.QuadCurve2D
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 22 Oct 2003 11:00:55 +0200
- Subject: FYI: Patch: java.awt.geom.QuadCurve2D
Hi list,
I commited the attached patch to merged java.awt.geom.QuadCurve2D with
classpath again.
Michael
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2287
diff -u -b -B -r1.2287 ChangeLog
--- ChangeLog 22 Oct 2003 08:47:11 -0000 1.2287
+++ ChangeLog 22 Oct 2003 08:53:19 -0000
@@ -1,3 +1,23 @@
+2003-10-22 Sascha Brawer <brawer@dandelis.ch>
+
+ * java/awt/geom/QuadCurve2D.java (subdivide): Added documentation.
+ java/awt/geom/doc-files/QuadCurve2D-3.png: New illustration.
+
+2003-10-22 Sascha Brawer <brawer@dandelis.ch>
+
+ * java/awt/geom/QuadCurve2D.java: Reformatted, wrote Javadoc.
+ * java/awt/geom/doc-files: New directory.
+ * java/awt/geom/doc-files/QuadCurve2D-1.png,
+ java/awt/geom/doc-files/QuadCurve2D-2.png: New illustrations.
+
+2003-10-22 Sascha Brawer <brawer@dandelis.ch>
+
+ * java/awt/geom/QuadCurve2D.java (subdivide): Implement.
+
+2003-10-22 Sascha Brawer <brawer@dandelis.ch>
+
+ * java/awt/geom/QuadCurve2D.java (getFlatness, getFlatnessSq): Implement.
+
2003-10-22 Michael Koch <konqueror@gmx.de>
* java/io/File.java
Index: java/awt/geom/QuadCurve2D.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/QuadCurve2D.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 QuadCurve2D.java
--- java/awt/geom/QuadCurve2D.java 18 Jul 2003 19:20:33 -0000 1.3
+++ java/awt/geom/QuadCurve2D.java 22 Oct 2003 08:53:19 -0000
@@ -1,5 +1,5 @@
/* QuadCurve2D.java -- represents a parameterized quadratic curve in 2-D space
- Copyright (C) 2002 Free Software Foundation
+ Copyright (C) 2002, 2003 Free Software Foundation
This file is part of GNU Classpath.
@@ -42,28 +42,117 @@
import java.awt.Shape;
import java.util.NoSuchElementException;
+
/**
- * STUBS ONLY
- * XXX Implement and document.
+ * A two-dimensional curve that is parameterized with a quadratic
+ * function.
+ *
+ * <p><img src="doc-files/QuadCurve2D-1.png" width="350" height="180"
+ * alt="A drawing of a QuadCurve2D" />
+ *
+ * @author Eric Blake (ebb9@email.byu.edu)
+ * @author Sascha Brawer (brawer@dandelis.ch)
+ *
+ * @since 1.2
*/
-public abstract class QuadCurve2D implements Shape, Cloneable
+public abstract class QuadCurve2D
+ implements Shape, Cloneable
{
+ /**
+ * Constructs a new QuadCurve2D. Typical users will want to
+ * construct instances of a subclass, such as {@link
+ * QuadCurve2D.Float} or {@link QuadCurve2D.Double}.
+ */
protected QuadCurve2D()
{
}
+
+ /**
+ * Returns the <i>x</i> coordinate of the curve’s start
+ * point.
+ */
public abstract double getX1();
+
+
+ /**
+ * Returns the <i>y</i> coordinate of the curve’s start
+ * point.
+ */
public abstract double getY1();
+
+
+ /**
+ * Returns the curve’s start point.
+ */
public abstract Point2D getP1();
+
+
+ /**
+ * Returns the <i>x</i> coordinate of the curve’s control
+ * point.
+ */
public abstract double getCtrlX();
+
+
+ /**
+ * Returns the <i>y</i> coordinate of the curve’s control
+ * point.
+ */
public abstract double getCtrlY();
+
+
+ /**
+ * Returns the curve’s control point.
+ */
public abstract Point2D getCtrlPt();
+
+
+ /**
+ * Returns the <i>x</i> coordinate of the curve’s end
+ * point.
+ */
public abstract double getX2();
+
+
+ /**
+ * Returns the <i>y</i> coordinate of the curve’s end
+ * point.
+ */
public abstract double getY2();
+
+
+ /**
+ * Returns the curve’s end point.
+ */
public abstract Point2D getP2();
+
+ /**
+ * Changes the geometry of the curve.
+ *
+ * @param x1 the <i>x</i> coordinate of the curve’s new start
+ * point.
+ *
+ * @param y1 the <i>y</i> coordinate of the curve’s new start
+ * point.
+ *
+ * @param cx the <i>x</i> coordinate of the curve’s new
+ * control point.
+ *
+ * @param cy the <i>y</i> coordinate of the curve’s new
+ * control point.
+ *
+ * @param x2 the <i>x</i> coordinate of the curve’s new end
+ * point.
+ *
+ * @param y2 the <i>y</i> coordinate of the curve’s new end
+ * point.
+ */
public abstract void setCurve(double x1, double y1, double cx, double cy,
double x2, double y2);
+
+
public void setCurve(double[] coords, int offset)
{
setCurve(coords[offset++], coords[offset++],
@@ -81,6 +174,13 @@
pts[offset].getX(), pts[offset++].getY(),
pts[offset].getX(), pts[offset++].getY());
}
+
+
+ /**
+ * Changes the geometry of the curve to that of another curve.
+ *
+ * @param c the curve whose coordinates will be copied.
+ */
public void setCurve(QuadCurve2D c)
{
setCurve(c.getX1(), c.getY1(), c.getCtrlX(), c.getCtrlY(),
@@ -89,9 +191,10 @@
public static double getFlatnessSq(double x1, double y1, double cx,
double cy, double x2, double y2)
{
- // XXX Implement.
- throw new Error("not implemented");
+ return Line2D.ptSegDistSq(x1, y1, x2, y2, cx, cy);
}
+
+
public static double getFlatness(double x1, double y1, double cx, double cy,
double x2, double y2)
{
@@ -95,55 +198,187 @@
public static double getFlatness(double x1, double y1, double cx, double cy,
double x2, double y2)
{
- return Math.sqrt(getFlatnessSq(x1, y1, cx, cy, x2, y2));
+ return Line2D.ptSegDist(x1, y1, x2, y2, cx, cy);
}
+
+
public static double getFlatnessSq(double[] coords, int offset)
{
- return getFlatnessSq(coords[offset++], coords[offset++],
- coords[offset++], coords[offset++],
- coords[offset++], coords[offset++]);
+ return Line2D.ptSegDistSq(coords[offset], coords[offset + 1],
+ coords[offset + 4], coords[offset + 5],
+ coords[offset + 2], coords[offset + 3]);
}
+
+
public static double getFlatness(double[] coords, int offset)
{
- return Math.sqrt(getFlatnessSq(coords[offset++], coords[offset++],
- coords[offset++], coords[offset++],
- coords[offset++], coords[offset++]));
+ return Line2D.ptSegDist(coords[offset], coords[offset + 1],
+ coords[offset + 4], coords[offset + 5],
+ coords[offset + 2], coords[offset + 3]);
}
+
+
public double getFlatnessSq()
{
- return getFlatnessSq(getX1(), getY1(), getCtrlX(), getCtrlY(),
- getX2(), getY2());
+ return Line2D.ptSegDistSq(getX1(), getY1(),
+ getX2(), getY2(),
+ getCtrlX(), getCtrlY());
}
+
+
public double getFlatness()
{
- return Math.sqrt(getFlatnessSq(getX1(), getY1(), getCtrlX(), getCtrlY(),
- getX2(), getY2()));
+ return Line2D.ptSegDist(getX1(), getY1(),
+ getX2(), getY2(),
+ getCtrlX(), getCtrlY());
}
- public void subdivide(QuadCurve2D l, QuadCurve2D r)
+
+ /**
+ * Subdivides this curve into two halves.
+ *
+ * <p><img src="doc-files/QuadCurve2D-3.png" width="700"
+ * height="180" alt="A drawing that illustrates the effects of
+ * subdividing a QuadCurve2D" />
+ *
+ * @param left a curve whose geometry will be set to the left half
+ * of this curve, or <code>null</code> if the caller is not
+ * interested in the left half.
+ *
+ * @param right a curve whose geometry will be set to the right half
+ * of this curve, or <code>null</code> if the caller is not
+ * interested in the right half.
+ */
+ public void subdivide(QuadCurve2D left, QuadCurve2D right)
{
- if (l == null)
- l = new QuadCurve2D.Double();
- if (r == null)
- r = new QuadCurve2D.Double();
// Use empty slots at end to share single array.
double[] d = new double[] { getX1(), getY1(), getCtrlX(), getCtrlY(),
getX2(), getY2(), 0, 0, 0, 0 };
subdivide(d, 0, d, 0, d, 4);
- l.setCurve(d, 0);
- r.setCurve(d, 4);
+ if (left != null)
+ left.setCurve(d, 0);
+ if (right != null)
+ right.setCurve(d, 4);
}
- public static void subdivide(QuadCurve2D src, QuadCurve2D l, QuadCurve2D r)
+
+
+ /**
+ * Subdivides a quadratic curve into two halves.
+ *
+ * <p><img src="doc-files/QuadCurve2D-3.png" width="700"
+ * height="180" alt="A drawing that illustrates the effects of
+ * subdividing a QuadCurve2D" />
+ *
+ * @param src the curve to be subdivided.
+ *
+ * @param left a curve whose geometry will be set to the left half
+ * of <code>src</code>, or <code>null</code> if the caller is not
+ * interested in the left half.
+ *
+ * @param right a curve whose geometry will be set to the right half
+ * of <code>src</code>, or <code>null</code> if the caller is not
+ * interested in the right half.
+ */
+ public static void subdivide(QuadCurve2D src, QuadCurve2D left,
+ QuadCurve2D right)
{
- src.subdivide(l, r);
+ src.subdivide(left, right);
}
+
+
+ /**
+ * Subdivides a quadratic curve into two halves, passing all
+ * coordinates in an array.
+ *
+ * <p><img src="doc-files/QuadCurve2D-3.png" width="700"
+ * height="180" alt="A drawing that illustrates the effects of
+ * subdividing a QuadCurve2D" />
+ *
+ * <p>The left end point and the right start point will always be
+ * identical. Memory-concious programmers thus may want to pass the
+ * same array for both <code>left</code> and <code>right</code>, and
+ * set <code>rightOff</code> to <code>leftOff + 4</code>.
+ *
+ * @param src an array containing the coordinates of the curve to be
+ * subdivided. The <i>x</i> coordinate of the start point is
+ * located at <code>src[srcOff]</code>, its <i>y</i> at
+ * <code>src[srcOff + 1]</code>. The <i>x</i> coordinate of the
+ * control point is located at <code>src[srcOff + 2]</code>, its
+ * <i>y</i> at <code>src[srcOff + 3]</code>. The <i>x</i>
+ * coordinate of the end point is located at <code>src[srcOff +
+ * 4]</code>, its <i>y</i> at <code>src[srcOff + 5]</code>.
+ *
+ * @param srcOff an offset into <code>src</code>, specifying
+ * the index of the start point’s <i>x</i> coordinate.
+ *
+ * @param left an array that will receive the coordinates of the
+ * left half of <code>src</code>. It is acceptable to pass
+ * <code>src</code>. A caller who is not interested in the left half
+ * can pass <code>null</code>.
+ *
+ * @param leftOff an offset into <code>left</code>, specifying the
+ * index where the start point’s <i>x</i> coordinate will be
+ * stored.
+ *
+ * @param right an array that will receive the coordinates of the
+ * right half of <code>src</code>. It is acceptable to pass
+ * <code>src</code> or <code>left</code>. A caller who is not
+ * interested in the right half can pass <code>null</code>.
+ *
+ * @param rightOff an offset into <code>right</code>, specifying the
+ * index where the start point’s <i>x</i> coordinate will be
+ * stored.
+ */
public static void subdivide(double[] src, int srcOff,
double[] left, int leftOff,
double[] right, int rightOff)
{
- // XXX Implement.
- throw new Error("not implemented");
+ double x1, y1, xc, yc, x2, y2;
+
+ x1 = src[srcOff];
+ y1 = src[srcOff + 1];
+ xc = src[srcOff + 2];
+ yc = src[srcOff + 3];
+ x2 = src[srcOff + 4];
+ y2 = src[srcOff + 5];
+
+ if (left != null)
+ {
+ left[leftOff] = x1;
+ left[leftOff + 1] = y1;
+ }
+
+ if (right != null)
+ {
+ right[rightOff + 4] = x2;
+ right[rightOff + 5] = y2;
+ }
+
+ x1 = (x1 + xc) / 2;
+ x2 = (xc + x2) / 2;
+ xc = (x1 + x2) / 2;
+ y1 = (y1 + yc) / 2;
+ y2 = (y2 + yc) / 2;
+ yc = (y1 + y2) / 2;
+
+ if (left != null)
+ {
+ left[leftOff + 2] = x1;
+ left[leftOff + 3] = y1;
+ left[leftOff + 4] = xc;
+ left[leftOff + 5] = yc;
}
+
+ if (right != null)
+ {
+ right[rightOff] = xc;
+ right[rightOff + 1] = yc;
+ right[rightOff + 2] = x2;
+ right[rightOff + 3] = y2;
+ }
+ }
+
+
public static int solveQuadratic(double[] eqn)
{
return solveQuadratic(eqn, eqn);
@@ -206,6 +454,18 @@
{
return contains(r.getX(), r.getY(), r.getWidth(), r.getHeight());
}
+
+
+ /**
+ * Determines the smallest rectangle that encloses the
+ * curve’s start, end and control point. As the illustration
+ * below shows, the invisible control point may cause the bounds to
+ * be much larger than the area that is actually covered by the
+ * curve.
+ *
+ * <p><img src="doc-files/QuadCurve2D-2.png" width="350" height="180"
+ * alt="An illustration of the bounds of a QuadCurve2D" />
+ */
public Rectangle getBounds()
{
return getBounds2D().getBounds();
@@ -288,15 +561,12 @@
return new FlatteningPathIterator(getPathIterator(at), flatness);
}
+
/**
- * Create a new curve of the same run-time type with the same contents as
+ * Creates a new curve with the same contents as
* this one.
*
- * @return the clone
- *
- * @exception OutOfMemoryError If there is not enough memory available.
- *
- * @since 1.2
+ * @return the clone.
*/
public Object clone()
{
@@ -310,22 +580,89 @@
}
}
+
/**
- * STUBS ONLY
+ * A two-dimensional curve that is parameterized with a quadratic
+ * function and stores coordinate values in double-precision
+ * floating-point format.
+ *
+ * @see QuadCurve2D.Float
+ *
+ * @author Eric Blake (ebb9@email.byu.edu)
+ * @author Sascha Brawer (brawer@dandelis.ch)
*/
- public static class Double extends QuadCurve2D
+ public static class Double
+ extends QuadCurve2D
{
+ /**
+ * The <i>x</i> coordinate of the curve’s start point.
+ */
public double x1;
+
+
+ /**
+ * The <i>y</i> coordinate of the curve’s start point.
+ */
public double y1;
+
+
+ /**
+ * The <i>x</i> coordinate of the curve’s control point.
+ */
public double ctrlx;
+
+
+ /**
+ * The <i>y</i> coordinate of the curve’s control point.
+ */
public double ctrly;
+
+
+ /**
+ * The <i>x</i> coordinate of the curve’s end point.
+ */
public double x2;
+
+
+ /**
+ * The <i>y</i> coordinate of the curve’s end point.
+ */
public double y2;
+
+ /**
+ * Constructs a new QuadCurve2D that stores its coordinate values
+ * in double-precision floating-point format. All points are
+ * initially at position (0, 0).
+ */
public Double()
{
}
+
+ /**
+ * Constructs a new QuadCurve2D that stores its coordinate values
+ * in double-precision floating-point format, specifying the
+ * initial position of each point.
+ *
+ * @param x1 the <i>x</i> coordinate of the curve’s start
+ * point.
+ *
+ * @param y1 the <i>y</i> coordinate of the curve’s start
+ * point.
+ *
+ * @param cx the <i>x</i> coordinate of the curve’s control
+ * point.
+ *
+ * @param cy the <i>y</i> coordinate of the curve’s control
+ * point.
+ *
+ * @param x2 the <i>x</i> coordinate of the curve’s end
+ * point.
+ *
+ * @param y2 the <i>y</i> coordinate of the curve’s end
+ * point.
+ */
public Double(double x1, double y1, double cx, double cy,
double x2, double y2)
{
@@ -337,45 +674,115 @@
this.y2 = y2;
}
+
+ /**
+ * Returns the <i>x</i> coordinate of the curve’s start
+ * point.
+ */
public double getX1()
{
return x1;
}
+
+
+ /**
+ * Returns the <i>y</i> coordinate of the curve’s start
+ * point.
+ */
public double getY1()
{
return y1;
}
+
+
+ /**
+ * Returns the curve’s start point.
+ */
public Point2D getP1()
{
return new Point2D.Double(x1, y1);
}
+
+ /**
+ * Returns the <i>x</i> coordinate of the curve’s control
+ * point.
+ */
public double getCtrlX()
{
return ctrlx;
}
+
+
+ /**
+ * Returns the <i>y</i> coordinate of the curve’s control
+ * point.
+ */
public double getCtrlY()
{
return ctrly;
}
+
+
+ /**
+ * Returns the curve’s control point.
+ */
public Point2D getCtrlPt()
{
return new Point2D.Double(ctrlx, ctrly);
}
+
+ /**
+ * Returns the <i>x</i> coordinate of the curve’s end
+ * point.
+ */
public double getX2()
{
return x2;
}
+
+
+ /**
+ * Returns the <i>y</i> coordinate of the curve’s end
+ * point.
+ */
public double getY2()
{
return y2;
}
+
+
+ /**
+ * Returns the curve’s end point.
+ */
public Point2D getP2()
{
return new Point2D.Double(x2, y2);
}
+
+ /**
+ * Changes the geometry of the curve.
+ *
+ * @param x1 the <i>x</i> coordinate of the curve’s new
+ * start point.
+ *
+ * @param y1 the <i>y</i> coordinate of the curve’s new
+ * start point.
+ *
+ * @param cx the <i>x</i> coordinate of the curve’s new
+ * control point.
+ *
+ * @param cy the <i>y</i> coordinate of the curve’s new
+ * control point.
+ *
+ * @param x2 the <i>x</i> coordinate of the curve’s new
+ * end point.
+ *
+ * @param y2 the <i>y</i> coordinate of the curve’s new
+ * end point.
+ */
public void setCurve(double x1, double y1, double cx, double cy,
double x2, double y2)
{
@@ -386,6 +793,18 @@
this.x2 = x2;
this.y2 = y2;
}
+
+
+ /**
+ * Determines the smallest rectangle that encloses the
+ * curve’s start, end and control point. As the
+ * illustration below shows, the invisible control point may cause
+ * the bounds to be much larger than the area that is actually
+ * covered by the curve.
+ *
+ * <p><img src="doc-files/QuadCurve2D-2.png" width="350" height="180"
+ * alt="An illustration of the bounds of a QuadCurve2D" />
+ */
public Rectangle2D getBounds2D()
{
double nx1 = Math.min(Math.min(x1, ctrlx), x2);
@@ -394,24 +813,91 @@
double ny2 = Math.max(Math.max(y1, ctrly), y2);
return new Rectangle2D.Double(nx1, ny1, nx2 - nx1, ny2 - ny1);
}
- } // class Double
+ }
+
/**
- * STUBS ONLY
+ * A two-dimensional curve that is parameterized with a quadratic
+ * function and stores coordinate values in single-precision
+ * floating-point format.
+ *
+ * @see QuadCurve2D.Double
+ *
+ * @author Eric Blake (ebb9@email.byu.edu)
+ * @author Sascha Brawer (brawer@dandelis.ch)
*/
- public static class Float extends QuadCurve2D
+ public static class Float
+ extends QuadCurve2D
{
+ /**
+ * The <i>x</i> coordinate of the curve’s start point.
+ */
public float x1;
+
+
+ /**
+ * The <i>y</i> coordinate of the curve’s start point.
+ */
public float y1;
+
+
+ /**
+ * The <i>x</i> coordinate of the curve’s control point.
+ */
public float ctrlx;
+
+
+ /**
+ * The <i>y</i> coordinate of the curve’s control point.
+ */
public float ctrly;
+
+
+ /**
+ * The <i>x</i> coordinate of the curve’s end point.
+ */
public float x2;
+
+
+ /**
+ * The <i>y</i> coordinate of the curve’s end point.
+ */
public float y2;
+
+ /**
+ * Constructs a new QuadCurve2D that stores its coordinate values
+ * in single-precision floating-point format. All points are
+ * initially at position (0, 0).
+ */
public Float()
{
}
+
+ /**
+ * Constructs a new QuadCurve2D that stores its coordinate values
+ * in single-precision floating-point format, specifying the
+ * initial position of each point.
+ *
+ * @param x1 the <i>x</i> coordinate of the curve’s start
+ * point.
+ *
+ * @param y1 the <i>y</i> coordinate of the curve’s start
+ * point.
+ *
+ * @param cx the <i>x</i> coordinate of the curve’s control
+ * point.
+ *
+ * @param cy the <i>y</i> coordinate of the curve’s control
+ * point.
+ *
+ * @param x2 the <i>x</i> coordinate of the curve’s end
+ * point.
+ *
+ * @param y2 the <i>y</i> coordinate of the curve’s end
+ * point.
+ */
public Float(float x1, float y1, float cx, float cy,
float x2, float y2)
{
@@ -423,45 +909,116 @@
this.y2 = y2;
}
+
+ /**
+ * Returns the <i>x</i> coordinate of the curve’s start
+ * point.
+ */
public double getX1()
{
return x1;
}
+
+
+ /**
+ * Returns the <i>y</i> coordinate of the curve’s start
+ * point.
+ */
public double getY1()
{
return y1;
}
+
+
+ /**
+ * Returns the curve’s start point.
+ */
public Point2D getP1()
{
return new Point2D.Float(x1, y1);
}
+
+ /**
+ * Returns the <i>x</i> coordinate of the curve’s control
+ * point.
+ */
public double getCtrlX()
{
return ctrlx;
}
+
+
+ /**
+ * Returns the <i>y</i> coordinate of the curve’s control
+ * point.
+ */
public double getCtrlY()
{
return ctrly;
}
+
+
+ /**
+ * Returns the curve’s control point.
+ */
public Point2D getCtrlPt()
{
return new Point2D.Float(ctrlx, ctrly);
}
+
+ /**
+ * Returns the <i>x</i> coordinate of the curve’s end
+ * point.
+ */
public double getX2()
{
return x2;
}
+
+
+ /**
+ * Returns the <i>y</i> coordinate of the curve’s end
+ * point.
+ */
public double getY2()
{
return y2;
}
+
+
+ /**
+ * Returns the curve’s end point.
+ */
public Point2D getP2()
{
return new Point2D.Float(x2, y2);
}
+
+ /**
+ * Changes the geometry of the curve, specifying coordinate values
+ * as double-precision floating-point numbers.
+ *
+ * @param x1 the <i>x</i> coordinate of the curve’s new
+ * start point.
+ *
+ * @param y1 the <i>y</i> coordinate of the curve’s new
+ * start point.
+ *
+ * @param cx the <i>x</i> coordinate of the curve’s new
+ * control point.
+ *
+ * @param cy the <i>y</i> coordinate of the curve’s new
+ * control point.
+ *
+ * @param x2 the <i>x</i> coordinate of the curve’s new
+ * end point.
+ *
+ * @param y2 the <i>y</i> coordinate of the curve’s new
+ * end point.
+ */
public void setCurve(double x1, double y1, double cx, double cy,
double x2, double y2)
{
@@ -472,6 +1029,30 @@
this.x2 = (float) x2;
this.y2 = (float) y2;
}
+
+
+ /**
+ * Changes the geometry of the curve, specifying coordinate values
+ * as single-precision floating-point numbers.
+ *
+ * @param x1 the <i>x</i> coordinate of the curve’s new
+ * start point.
+ *
+ * @param y1 the <i>y</i> coordinate of the curve’s new
+ * start point.
+ *
+ * @param cx the <i>x</i> coordinate of the curve’s new
+ * control point.
+ *
+ * @param cy the <i>y</i> coordinate of the curve’s new
+ * control point.
+ *
+ * @param x2 the <i>x</i> coordinate of the curve’s new
+ * end point.
+ *
+ * @param y2 the <i>y</i> coordinate of the curve’s new
+ * end point.
+ */
public void setCurve(float x1, float y1, float cx, float cy,
float x2, float y2)
{
@@ -482,6 +1063,18 @@
this.x2 = x2;
this.y2 = y2;
}
+
+
+ /**
+ * Determines the smallest rectangle that encloses the
+ * curve’s start, end and control point. As the
+ * illustration below shows, the invisible control point may cause
+ * the bounds to be much larger than the area that is actually
+ * covered by the curve.
+ *
+ * <p><img src="doc-files/QuadCurve2D-2.png" width="350" height="180"
+ * alt="An illustration of the bounds of a QuadCurve2D" />
+ */
public Rectangle2D getBounds2D()
{
float nx1 = (float) Math.min(Math.min(x1, ctrlx), x2);
@@ -490,5 +1083,5 @@
float ny2 = (float) Math.max(Math.max(y1, ctrly), y2);
return new Rectangle2D.Float(nx1, ny1, nx2 - nx1, ny2 - ny1);
}
- } // class Float
-} // class CubicCurve2D
+ }
+}
Index: java/awt/geom/doc-files/QuadCurve2D-1.png
===================================================================
RCS file: java/awt/geom/doc-files/QuadCurve2D-1.png
diff -N java/awt/geom/doc-files/QuadCurve2D-1.png
Binary files /dev/null and QuadCurve2D-1.png differ
Index: java/awt/geom/doc-files/QuadCurve2D-2.png
===================================================================
RCS file: java/awt/geom/doc-files/QuadCurve2D-2.png
diff -N java/awt/geom/doc-files/QuadCurve2D-2.png
Binary files /dev/null and QuadCurve2D-2.png differ
Index: java/awt/geom/doc-files/QuadCurve2D-3.png
===================================================================
RCS file: java/awt/geom/doc-files/QuadCurve2D-3.png
diff -N java/awt/geom/doc-files/QuadCurve2D-3.png
Binary files /dev/null and QuadCurve2D-3.png differ