Index: trunk/src/com/kitfox/svg/Path.java =================================================================== --- trunk/src/com/kitfox/svg/Path.java (revision 4256) +++ trunk/src/com/kitfox/svg/Path.java (revision 6002) @@ -1,49 +1,55 @@ /* - * Rect.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, 5:25 PM */ - package com.kitfox.svg; import com.kitfox.svg.xml.StyleAttribute; -import java.awt.*; -import java.awt.geom.*; - -import com.kitfox.svg.pathcmd.*; -import com.kitfox.svg.xml.*; -import org.xml.sax.*; +import java.awt.Graphics2D; +import java.awt.Shape; +import java.awt.geom.GeneralPath; +import java.awt.geom.Rectangle2D; //import org.apache.batik.ext.awt.geom.ExtendedGeneralPath; - /** * @author Mark McKay * @author Mark McKay */ -public class Path extends ShapeElement { +public class Path extends ShapeElement +{ + public static final String TAG_NAME = "path"; // PathCommand[] commands = null; - int fillRule = GeneralPath.WIND_NON_ZERO; String d = ""; @@ -51,42 +57,34 @@ GeneralPath path; - /** Creates a new instance of Rect */ - public Path() { + /** + * Creates a new instance of Rect + */ + public Path() + { } - /* - public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) + public String getTagName() { - //Load style string - super.loaderStartElement(helper, attrs, parent); + return TAG_NAME; + } - StyleAttribute styleAttrib = getStyle("fill-rule"); - String fillRule = (styleAttrib == null) ? "nonzero" : styleAttrib.getStringValue(); - - String d = attrs.getValue("d"); - path = buildPath(d, fillRule.equals("evenodd") ? GeneralPath.WIND_EVEN_ODD : GeneralPath.WIND_NON_ZERO); - } - */ - protected void build() throws SVGException { super.build(); - + StyleAttribute sty = new StyleAttribute(); - - - String fillRuleStrn = (getStyle(sty.setName("fill-rule"))) ? sty.getStringValue() : "nonzero"; + + + String fillRuleStrn = (getStyle(sty.setName("fill-rule"))) ? sty.getStringValue() : "nonzero"; fillRule = fillRuleStrn.equals("evenodd") ? GeneralPath.WIND_EVEN_ODD : GeneralPath.WIND_NON_ZERO; - -// String d = ""; - if (getPres(sty.setName("d"))) d = sty.getStringValue(); -//System.err.println(d); - + if (getPres(sty.setName("d"))) + { + d = sty.getStringValue(); + } + path = buildPath(d, fillRule); - -//System.err.println(d); } - + public void render(Graphics2D g) throws SVGException { @@ -107,6 +105,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 @@ -120,9 +119,9 @@ StyleAttribute sty = new StyleAttribute(); boolean shapeChange = false; - + if (getStyle(sty.setName("fill-rule"))) { - int newVal = sty.getStringValue().equals("evenodd") - ? GeneralPath.WIND_EVEN_ODD + int newVal = sty.getStringValue().equals("evenodd") + ? GeneralPath.WIND_EVEN_ODD : GeneralPath.WIND_NON_ZERO; if (newVal != fillRule) @@ -132,5 +131,5 @@ } } - + if (getPres(sty.setName("d"))) { @@ -142,5 +141,5 @@ } } - + if (shapeChange) { @@ -149,5 +148,5 @@ // return true; } - + return changeState || shapeChange; }