Index: trunk/src/com/kitfox/svg/RenderableElement.java =================================================================== --- trunk/src/com/kitfox/svg/RenderableElement.java (revision 4256) +++ trunk/src/com/kitfox/svg/RenderableElement.java (revision 6002) @@ -1,29 +1,37 @@ /* - * BoundedElement.java + * 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: * - * The Salamander Project - 2D and 3D graphics libraries in Java - * Copyright (C) 2004 Mark McKay + * - 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 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 + * 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, 9:00 AM */ - package com.kitfox.svg; @@ -38,6 +46,4 @@ import java.util.List; - - /** * Maintains bounding box for this element @@ -46,16 +52,18 @@ * @author Mark McKay */ -abstract public class RenderableElement extends TransformableElement +abstract public class RenderableElement extends TransformableElement { - AffineTransform cachedXform = null; + Shape cachedClip = null; - public static final int VECTOR_EFFECT_NONE = 0; public static final int VECTOR_EFFECT_NON_SCALING_STROKE = 1; int vectorEffect; - /** Creates a new instance of BoundedElement */ - public RenderableElement() { + /** + * Creates a new instance of BoundedElement + */ + public RenderableElement() + { } @@ -68,7 +76,7 @@ { super.build(); - + StyleAttribute sty = new StyleAttribute(); - + if (getPres(sty.setName("vector-effect"))) { @@ -76,29 +84,28 @@ { vectorEffect = VECTOR_EFFECT_NON_SCALING_STROKE; - } - else + } else { vectorEffect = VECTOR_EFFECT_NONE; } - } - else + } else { vectorEffect = VECTOR_EFFECT_NONE; } } - + abstract public void render(Graphics2D g) throws SVGException; - + abstract void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException; - + abstract void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException; - + abstract public Rectangle2D getBoundingBox() throws SVGException; -/* - public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) - { - super.loaderStartElement(helper, attrs, parent); - } -*/ + /* + public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) + { + super.loaderStartElement(helper, attrs, parent); + } + */ + /** * Pushes transform stack, transforms to local coordinates and sets up @@ -114,15 +121,16 @@ StyleAttribute styleAttrib = new StyleAttribute(); - + //Get clipping path // StyleAttribute styleAttrib = getStyle("clip-path", false); Shape clipPath = null; int clipPathUnits = ClipPath.CP_USER_SPACE_ON_USE; - if (getStyle(styleAttrib.setName("clip-path"))) + if (getStyle(styleAttrib.setName("clip-path"), false) + && !"none".equals(styleAttrib.getStringValue())) { URI uri = styleAttrib.getURIValue(getXMLBase()); if (uri != null) { - ClipPath ele = (ClipPath)diagram.getUniverse().getElement(uri); + ClipPath ele = (ClipPath) diagram.getUniverse().getElement(uri); clipPath = ele.getClipPathShape(); clipPathUnits = ele.getClipPathUnits(); @@ -135,5 +143,5 @@ if (clipPathUnits == ClipPath.CP_OBJECT_BOUNDING_BOX && (this instanceof ShapeElement)) { - Rectangle2D rect = ((ShapeElement)this).getBoundingBox(); + Rectangle2D rect = ((ShapeElement) this).getBoundingBox(); AffineTransform at = new AffineTransform(); at.scale(rect.getWidth(), rect.getHeight()); @@ -142,13 +150,19 @@ cachedClip = g.getClip(); - Area newClip = new Area(cachedClip); - newClip.intersect(new Area(clipPath)); - g.setClip(newClip); + if (cachedClip == null) + { + g.setClip(clipPath); + } else + { + Area newClip = new Area(cachedClip); + newClip.intersect(new Area(clipPath)); + g.setClip(newClip); + } } } /** - * Restores transform and clipping values to the way they were before - * this layer was drawn. + * Restores transform and clipping values to the way they were before this + * layer was drawn. */ protected void finishLayer(Graphics2D g) @@ -164,4 +178,3 @@ } } - }