Index: trunk/src/com/kitfox/svg/Rect.java =================================================================== --- trunk/src/com/kitfox/svg/Rect.java (revision 4256) +++ trunk/src/com/kitfox/svg/Rect.java (revision 6002) @@ -1,35 +1,45 @@ /* - * 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 java.awt.Graphics2D; +import java.awt.Shape; +import java.awt.geom.Rectangle2D; +import java.awt.geom.RectangularShape; +import java.awt.geom.RoundRectangle2D; import java.io.IOException; import java.io.ObjectInputStream; @@ -40,5 +50,7 @@ * @author Mark McKay */ -public class Rect extends ShapeElement { +public class Rect extends ShapeElement +{ + public static final String TAG_NAME = "rect"; float x = 0f; @@ -48,12 +60,19 @@ float rx = 0f; float ry = 0f; - RectangularShape rect; - /** Creates a new instance of Rect */ - public Rect() { - } - - private void writeObject(ObjectOutputStream out) throws IOException + /** + * Creates a new instance of Rect + */ + public Rect() + { + } + + public String getTagName() + { + return TAG_NAME; + } + + private void writeObject(ObjectOutputStream out) throws IOException { out.writeFloat(x); @@ -64,5 +83,5 @@ out.writeFloat(ry); } - + private void readObject(ObjectInputStream in) throws IOException { @@ -73,52 +92,50 @@ rx = in.readFloat(); ry = in.readFloat(); - + if (rx == 0f && ry == 0f) { rect = new Rectangle2D.Float(x, y, width, height); - } - else + } else { rect = new RoundRectangle2D.Float(x, y, width, height, rx * 2, ry * 2); } } - + /* - public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) - { - //Load style string - super.loaderStartElement(helper, attrs, parent); - - String x = attrs.getValue("x"); - String y = attrs.getValue("y"); - String width = attrs.getValue("width"); - String height = attrs.getValue("height"); - String rx = attrs.getValue("rx"); - String ry = attrs.getValue("ry"); - - if (rx == null) rx = ry; - if (ry == null) ry = rx; - - this.x = XMLParseUtil.parseFloat(x); - this.y = XMLParseUtil.parseFloat(y); - this.width = XMLParseUtil.parseFloat(width); - this.height = XMLParseUtil.parseFloat(height); - if (rx != null) - { - this.rx = XMLParseUtil.parseFloat(rx); - this.ry = XMLParseUtil.parseFloat(ry); - } - - build(); -// setBounds(this.x, this.y, this.width, this.height); - } -*/ - + public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) + { + //Load style string + super.loaderStartElement(helper, attrs, parent); + + String x = attrs.getValue("x"); + String y = attrs.getValue("y"); + String width = attrs.getValue("width"); + String height = attrs.getValue("height"); + String rx = attrs.getValue("rx"); + String ry = attrs.getValue("ry"); + + if (rx == null) rx = ry; + if (ry == null) ry = rx; + + this.x = XMLParseUtil.parseFloat(x); + this.y = XMLParseUtil.parseFloat(y); + this.width = XMLParseUtil.parseFloat(width); + this.height = XMLParseUtil.parseFloat(height); + if (rx != null) + { + this.rx = XMLParseUtil.parseFloat(rx); + this.ry = XMLParseUtil.parseFloat(ry); + } + + build(); + // setBounds(this.x, this.y, this.width, this.height); + } + */ protected void build() throws SVGException { super.build(); - + StyleAttribute sty = new StyleAttribute(); - + // SVGElement parent = this.getParent(); // if (parent instanceof RenderableElement) @@ -128,29 +145,54 @@ // bounds = null; // } - - - if (getPres(sty.setName("x"))) x = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("y"))) y = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("width"))) width = sty.getFloatValueWithUnits(); - - if (getPres(sty.setName("height"))) height = sty.getFloatValueWithUnits(); + + + if (getPres(sty.setName("x"))) + { + x = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("y"))) + { + y = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("width"))) + { + width = sty.getFloatValueWithUnits(); + } + + if (getPres(sty.setName("height"))) + { + height = sty.getFloatValueWithUnits(); + } boolean rxSet = false; - if (getPres(sty.setName("rx"))) { rx = sty.getFloatValueWithUnits(); rxSet = true; } - + if (getPres(sty.setName("rx"))) + { + rx = sty.getFloatValueWithUnits(); + rxSet = true; + } + boolean rySet = false; - if (getPres(sty.setName("ry"))) { ry = sty.getFloatValueWithUnits(); rySet = true; } - - if (!rxSet) rx = ry; - if (!rySet) ry = rx; - - + if (getPres(sty.setName("ry"))) + { + ry = sty.getFloatValueWithUnits(); + rySet = true; + } + + if (!rxSet) + { + rx = ry; + } + if (!rySet) + { + ry = rx; + } + + if (rx == 0f && ry == 0f) { rect = new Rectangle2D.Float(x, y, width, height); - } - else + } else { rect = new RoundRectangle2D.Float(x, y, width, height, rx * 2, ry * 2); @@ -176,6 +218,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 @@ -189,5 +232,5 @@ StyleAttribute sty = new StyleAttribute(); boolean shapeChange = false; - + if (getPres(sty.setName("x"))) { @@ -263,5 +306,5 @@ // return true; } - + return changeState || shapeChange; }