Index: trunk/src/com/kitfox/svg/RadialGradient.java =================================================================== --- trunk/src/com/kitfox/svg/RadialGradient.java (revision 4256) +++ trunk/src/com/kitfox/svg/RadialGradient.java (revision 6002) @@ -1,41 +1,45 @@ /* - * RadialGradient.java - * - * - * The Salamander Project - 2D and 3D graphics libraries in Java - * Copyright (C) 2004 Mark McKay - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Mark McKay can be contacted at mark@kitfox.com. Salamander and other - * projects can be found at http://www.kitfox.com + * SVG Salamander + * Copyright (c) 2004, Mark McKay + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Mark McKay can be contacted at mark@kitfox.com. Salamander and other + * projects can be found at http://www.kitfox.com * * Created on January 26, 2004, 1:55 AM */ - package com.kitfox.svg; import com.kitfox.svg.xml.StyleAttribute; -import java.awt.geom.*; -import java.awt.*; - -import com.kitfox.svg.xml.*; -import org.xml.sax.*; - -//import org.apache.batik.ext.awt.*; -import com.kitfox.svg.batik.*; - +import java.awt.Color; +import java.awt.Paint; +import java.awt.geom.AffineTransform; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; /** @@ -43,5 +47,7 @@ * @author Mark McKay */ -public class RadialGradient extends Gradient { +public class RadialGradient extends Gradient +{ + public static final String TAG_NAME = "radialgradient"; float cx = 0.5f; @@ -51,53 +57,48 @@ float r = 0.5f; - /** Creates a new instance of RadialGradient */ - public RadialGradient() { - } -/* - public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) - { - //Load style string - super.loaderStartElement(helper, attrs, parent); - - String cx = attrs.getValue("cx"); - String cy = attrs.getValue("cy"); - String fx = attrs.getValue("fx"); - String fy = attrs.getValue("fy"); - String r = attrs.getValue("r"); - - if (cx != null) this.cx = (float)XMLParseUtil.parseRatio(cx); - if (cy != null) this.cy = (float)XMLParseUtil.parseRatio(cy); - if (fx != null) this.fx = (float)XMLParseUtil.parseRatio(fx); - if (fy != null) this.fy = (float)XMLParseUtil.parseRatio(fy); - if (r != null) this.r = (float)XMLParseUtil.parseRatio(r); - } - */ - - /* - public void loaderEndElement(SVGLoaderHelper helper) - { - super.loaderEndElement(helper); - - build(); - } + /** + * Creates a new instance of RadialGradient */ - + public RadialGradient() + { + } + + public String getTagName() + { + return TAG_NAME; + } + protected void build() throws SVGException { super.build(); - + StyleAttribute sty = new StyleAttribute(); - - if (getPres(sty.setName("cx"))) cx = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("cy"))) cy = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("fx"))) fx = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("fy"))) fy = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("r"))) r = sty.getFloatValueWithUnits(); - } - + + if (getPres(sty.setName("cx"))) + { + cx = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("cy"))) + { + cy = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("fx"))) + { + fx = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("fy"))) + { + fy = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("r"))) + { + r = sty.getFloatValueWithUnits(); + } + } + public Paint getPaint(Rectangle2D bounds, AffineTransform xform) { @@ -117,12 +118,17 @@ } - com.kitfox.svg.batik.RadialGradientPaint paint; - - if (gradientUnits == GU_USER_SPACE_ON_USE) + Paint paint; + Point2D.Float pt1 = new Point2D.Float(cx, cy); + Point2D.Float pt2 = new Point2D.Float(fx, fy); + if (pt1.equals(pt2)) + { + Color[] colors = getStopColors(); + paint = colors.length > 0 ? colors[0] : Color.black; + } else if (gradientUnits == GU_USER_SPACE_ON_USE) { paint = new com.kitfox.svg.batik.RadialGradientPaint( - new Point2D.Float(cx, cy), + pt1, r, - new Point2D.Float(fx, fy), + pt2, getStopFractions(), getStopColors(), @@ -130,6 +136,5 @@ com.kitfox.svg.batik.MultipleGradientPaint.SRGB, gradientTransform); - } - else + } else { AffineTransform viewXform = new AffineTransform(); @@ -140,7 +145,7 @@ paint = new com.kitfox.svg.batik.RadialGradientPaint( - new Point2D.Float(cx, cy), + pt1, r, - new Point2D.Float(fx, fy), + pt2, getStopFractions(), getStopColors(), @@ -154,6 +159,7 @@ /** - * Updates all attributes in this diagram associated with a time event. - * Ie, all attributes with track information. + * Updates all attributes in this diagram associated with a time event. Ie, + * all attributes with track information. + * * @return - true if this node has changed state as a result of the time * update @@ -167,5 +173,5 @@ StyleAttribute sty = new StyleAttribute(); boolean shapeChange = false; - + if (getPres(sty.setName("cx"))) { @@ -177,5 +183,5 @@ } } - + if (getPres(sty.setName("cy"))) { @@ -187,5 +193,5 @@ } } - + if (getPres(sty.setName("fx"))) { @@ -197,5 +203,5 @@ } } - + if (getPres(sty.setName("fy"))) { @@ -207,5 +213,5 @@ } } - + if (getPres(sty.setName("r"))) { @@ -217,5 +223,5 @@ } } - + return changeState; }