Index: trunk/src/com/kitfox/svg/LinearGradient.java =================================================================== --- trunk/src/com/kitfox/svg/LinearGradient.java (revision 4256) +++ trunk/src/com/kitfox/svg/LinearGradient.java (revision 6002) @@ -1,41 +1,45 @@ /* - * LinearGradient.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:54 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,6 +47,8 @@ * @author Mark McKay */ -public class LinearGradient extends Gradient { - +public class LinearGradient extends Gradient +{ + public static final String TAG_NAME = "lineargradient"; + float x1 = 0f; float y1 = 0f; @@ -50,48 +56,43 @@ float y2 = 0f; - /** Creates a new instance of LinearGradient */ - public LinearGradient() { - } -/* - public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) - { - //Load style string - super.loaderStartElement(helper, attrs, parent); - - String x1 = attrs.getValue("x1"); - String x2 = attrs.getValue("x2"); - String y1 = attrs.getValue("y1"); - String y2 = attrs.getValue("y2"); - - if (x1 != null) this.x1 = (float)XMLParseUtil.parseRatio(x1); - if (y1 != null) this.y1 = (float)XMLParseUtil.parseRatio(y1); - if (x2 != null) this.x2 = (float)XMLParseUtil.parseRatio(x2); - if (y2 != null) this.y2 = (float)XMLParseUtil.parseRatio(y2); - } -*/ - /* - public void loaderEndElement(SVGLoaderHelper helper) - { - super.loaderEndElement(helper); - - build(); - } - */ - + /** + * Creates a new instance of LinearGradient + */ + public LinearGradient() + { + } + + public String getTagName() + { + return TAG_NAME; + } + protected void build() throws SVGException { super.build(); - + StyleAttribute sty = new StyleAttribute(); - - if (getPres(sty.setName("x1"))) x1 = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("y1"))) y1 = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("x2"))) x2 = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("y2"))) y2 = sty.getFloatValueWithUnits(); - } - + + if (getPres(sty.setName("x1"))) + { + x1 = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("y1"))) + { + y1 = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("x2"))) + { + x2 = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("y2"))) + { + y2 = sty.getFloatValueWithUnits(); + } + } + public Paint getPaint(Rectangle2D bounds, AffineTransform xform) { @@ -111,34 +112,41 @@ } - com.kitfox.svg.batik.LinearGradientPaint paint; - if (gradientUnits == GU_USER_SPACE_ON_USE) - { -// paint = new LinearGradientPaint(x1, y1, x2, y2, getStopFractions(), getStopColors(), method); + Paint paint; + Point2D.Float pt1 = new Point2D.Float(x1, y1); + Point2D.Float pt2 = new Point2D.Float(x2, y2); + 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.LinearGradientPaint( - new Point2D.Float(x1, y1), - new Point2D.Float(x2, y2), + pt1, + pt2, getStopFractions(), getStopColors(), method, com.kitfox.svg.batik.MultipleGradientPaint.SRGB, - gradientTransform); - } - else + gradientTransform == null + ? new AffineTransform() + : gradientTransform); + } else { AffineTransform viewXform = new AffineTransform(); viewXform.translate(bounds.getX(), bounds.getY()); - + //This is a hack to get around shapes that have a width or height of 0. Should be close enough to the true answer. - double width = bounds.getWidth(); - double height = bounds.getHeight(); - if (width == 0) width = 1; - if (height == 0) height = 1; + double width = Math.max(1, bounds.getWidth()); + double height = Math.max(1, bounds.getHeight()); viewXform.scale(width, height); - viewXform.concatenate(gradientTransform); + if (gradientTransform != null) + { + viewXform.concatenate(gradientTransform); + } paint = new com.kitfox.svg.batik.LinearGradientPaint( - new Point2D.Float(x1, y1), - new Point2D.Float(x2, y2), + pt1, + pt2, getStopFractions(), getStopColors(), @@ -150,8 +158,9 @@ return paint; } - + /** - * 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 @@ -165,5 +174,5 @@ StyleAttribute sty = new StyleAttribute(); boolean shapeChange = false; - + if (getPres(sty.setName("x1"))) {