Index: trunk/src/com/kitfox/svg/pathcmd/Arc.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/Arc.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/Arc.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -70,10 +79,14 @@ public void appendPath(GeneralPath path, BuildHistory hist) { - float offx = isRelative ? hist.history[0].x : 0f; - float offy = isRelative ? hist.history[0].y : 0f; - - arcTo(path, rx, ry, xAxisRot, largeArc, sweep, x + offx, y + offy, hist.history[0].x, hist.history[0].y); + float offx = isRelative ? hist.lastPoint.x : 0f; + float offy = isRelative ? hist.lastPoint.y : 0f; + + arcTo(path, rx, ry, xAxisRot, largeArc, sweep, + x + offx, y + offy, + hist.lastPoint.x, hist.lastPoint.y); // path.lineTo(x + offx, y + offy); - hist.setPoint(x + offx, y + offy); +// hist.setPoint(x + offx, y + offy); + hist.setLastPoint(x + offx, y + offy); + hist.setLastKnot(x + offx, y + offy); } @@ -243,3 +256,11 @@ return arc; } + + public String toString() + { + return "A " + rx + " " + ry + + " " + xAxisRot + " " + largeArc + + " " + sweep + + " " + x + " " + y; + } } Index: trunk/src/com/kitfox/svg/pathcmd/BuildHistory.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/BuildHistory.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/BuildHistory.java (revision 6002) @@ -1,29 +1,37 @@ /* - * BuildHistory.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:18 PM */ - package com.kitfox.svg.pathcmd; @@ -32,5 +40,5 @@ /** * When building a path from command segments, most need to cache information - * (such as the point finished at) for future commands. This structure allows + * (such as the point finished at) for future commands. This structure allows * that * @@ -38,31 +46,51 @@ * @author Mark McKay */ -public class BuildHistory { +public class BuildHistory +{ // Point2D.Float[] history = new Point2D.Float[2]; - Point2D.Float[] history = {new Point2D.Float(), new Point2D.Float()}; - Point2D.Float start = new Point2D.Float(); - int length = 0; +// Point2D.Float[] history = {new Point2D.Float(), new Point2D.Float()}; +// Point2D.Float start = new Point2D.Float(); + Point2D.Float startPoint = new Point2D.Float(); + Point2D.Float lastPoint = new Point2D.Float(); + Point2D.Float lastKnot = new Point2D.Float(); + boolean init; + //int length = 0; - /** Creates a new instance of BuildHistory */ - public BuildHistory() { + /** + * Creates a new instance of BuildHistory + */ + public BuildHistory() + { } - - public void setPoint(float x, float y) + + public void setStartPoint(float x, float y) { - history[0].setLocation(x, y); - length = 1; + startPoint.setLocation(x, y); } - - public void setStart(float x, float y) + + public void setLastPoint(float x, float y) { - start.setLocation(x, y); + lastPoint.setLocation(x, y); } - - public void setPointAndKnot(float x, float y, float kx, float ky) + + public void setLastKnot(float x, float y) { - history[0].setLocation(x, y); - history[1].setLocation(kx, ky); - length = 2; + lastKnot.setLocation(x, y); } +// public void setPoint(float x, float y) +// { +// history[0].setLocation(x, y); +// length = 1; +// } +// public void setStart(float x, float y) +// { +// start.setLocation(x, y); +// } +// public void setPointAndKnot(float x, float y, float kx, float ky) +// { +// history[0].setLocation(x, y); +// history[1].setLocation(kx, ky); +// length = 2; +// } } Index: trunk/src/com/kitfox/svg/pathcmd/Cubic.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/Cubic.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/Cubic.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -48,4 +57,11 @@ } + public String toString() + { + return "C " + k1x + " " + k1y + + " " + k2x + " " + k2y + + " " + x + " " + y; + } + public Cubic(boolean isRelative, float k1x, float k1y, float k2x, float k2y, float x, float y) { super(isRelative); @@ -61,9 +77,13 @@ public void appendPath(GeneralPath path, BuildHistory hist) { - float offx = isRelative ? hist.history[0].x : 0f; - float offy = isRelative ? hist.history[0].y : 0f; + float offx = isRelative ? hist.lastPoint.x : 0f; + float offy = isRelative ? hist.lastPoint.y : 0f; - path.curveTo(k1x + offx, k1y + offy, k2x + offx, k2y + offy, x + offx, y + offy); - hist.setPointAndKnot(x + offx, y + offy, k2x + offx, k2y + offy); + path.curveTo(k1x + offx, k1y + offy, + k2x + offx, k2y + offy, + x + offx, y + offy); +// hist.setPointAndKnot(x + offx, y + offy, k2x + offx, k2y + offy); + hist.setLastPoint(x + offx, y + offy); + hist.setLastKnot(k2x + offx, k2y + offy); } Index: trunk/src/com/kitfox/svg/pathcmd/CubicSmooth.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/CubicSmooth.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/CubicSmooth.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -57,11 +66,11 @@ public void appendPath(GeneralPath path, BuildHistory hist) { - float offx = isRelative ? hist.history[0].x : 0f; - float offy = isRelative ? hist.history[0].y : 0f; + float offx = isRelative ? hist.lastPoint.x : 0f; + float offy = isRelative ? hist.lastPoint.y : 0f; - float oldKx = hist.history.length >= 2 ? hist.history[1].x : hist.history[0].x; - float oldKy = hist.history.length >= 2 ? hist.history[1].y : hist.history[0].y; - float oldX = hist.history[0].x; - float oldY = hist.history[0].y; + float oldKx = hist.lastKnot.x; + float oldKy = hist.lastKnot.y; + float oldX = hist.lastPoint.x; + float oldY = hist.lastPoint.y; //Calc knot as reflection of old knot float k1x = oldX * 2f - oldKx; @@ -69,5 +78,6 @@ path.curveTo(k1x, k1y, k2x + offx, k2y + offy, x + offx, y + offy); - hist.setPointAndKnot(x + offx, y + offy, k2x + offx, k2y + offy); + hist.setLastPoint(x + offx, y + offy); + hist.setLastKnot(k2x + offx, k2y + offy); } @@ -76,3 +86,9 @@ return 6; } + + public String toString() + { + return "S " + k2x + " " + k2y + + " " + x + " " + y; + } } Index: trunk/src/com/kitfox/svg/pathcmd/Horizontal.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/Horizontal.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/Horizontal.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -43,4 +52,9 @@ } + public String toString() + { + return "H " + x; + } + public Horizontal(boolean isRelative, float x) { super(isRelative); @@ -52,9 +66,10 @@ public void appendPath(GeneralPath path, BuildHistory hist) { - float offx = isRelative ? hist.history[0].x : 0f; - float offy = hist.history[0].y; + float offx = isRelative ? hist.lastPoint.x : 0f; + float offy = hist.lastPoint.y; path.lineTo(x + offx, offy); - hist.setPoint(x + offx, offy); + hist.setLastPoint(x + offx, offy); + hist.setLastKnot(x + offx, offy); } Index: trunk/src/com/kitfox/svg/pathcmd/LineTo.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/LineTo.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/LineTo.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -54,9 +63,10 @@ public void appendPath(GeneralPath path, BuildHistory hist) { - float offx = isRelative ? hist.history[0].x : 0f; - float offy = isRelative ? hist.history[0].y : 0f; + float offx = isRelative ? hist.lastPoint.x : 0f; + float offy = isRelative ? hist.lastPoint.y : 0f; path.lineTo(x + offx, y + offy); - hist.setPoint(x + offx, y + offy); + hist.setLastPoint(x + offx, y + offy); + hist.setLastKnot(x + offx, y + offy); } @@ -65,3 +75,8 @@ return 2; } + + public String toString() + { + return "L " + x + " " + y; + } } Index: trunk/src/com/kitfox/svg/pathcmd/MoveTo.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/MoveTo.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/MoveTo.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -53,10 +62,11 @@ public void appendPath(GeneralPath path, BuildHistory hist) { - float offx = isRelative ? hist.history[0].x : 0f; - float offy = isRelative ? hist.history[0].y : 0f; + float offx = isRelative ? hist.lastPoint.x : 0f; + float offy = isRelative ? hist.lastPoint.y : 0f; path.moveTo(x + offx, y + offy); - hist.setPoint(x + offx, y + offy); - hist.setStart(x + offx, y + offy); + hist.setStartPoint(x + offx, y + offy); + hist.setLastPoint(x + offx, y + offy); + hist.setLastKnot(x + offx, y + offy); } @@ -65,3 +75,10 @@ return 2; } + + public String toString() + { + return "M " + x + " " + y; + } + + } Index: trunk/src/com/kitfox/svg/pathcmd/PathCommand.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/PathCommand.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/PathCommand.java (revision 6002) @@ -1,25 +1,34 @@ /* - * PathCommand.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, 8:39 PM Index: trunk/src/com/kitfox/svg/pathcmd/PathUtil.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/PathUtil.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/PathUtil.java (revision 6002) @@ -1,10 +1,36 @@ /* - * PathUtil.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: + * + * - 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 May 10, 2005, 5:56 AM - * - * To change this template, choose Tools | Options and locate the template under - * the Source Creation and Management node. Right-click the template and choose - * Open. You can then make changes to the template in the Source Editor. */ Index: trunk/src/com/kitfox/svg/pathcmd/Quadratic.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/Quadratic.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/Quadratic.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -46,4 +55,10 @@ } + public String toString() + { + return "Q " + kx + " " + ky + + " " + x + " " + y; + } + public Quadratic(boolean isRelative, float kx, float ky, float x, float y) { super(isRelative); @@ -57,9 +72,10 @@ public void appendPath(GeneralPath path, BuildHistory hist) { - float offx = isRelative ? hist.history[0].x : 0f; - float offy = isRelative ? hist.history[0].y : 0f; + float offx = isRelative ? hist.lastPoint.x : 0f; + float offy = isRelative ? hist.lastPoint.y : 0f; path.quadTo(kx + offx, ky + offy, x + offx, y + offy); - hist.setPointAndKnot(x + offx, y + offy, kx + offx, ky + offy); + hist.setLastPoint(x + offx, y + offy); + hist.setLastKnot(kx + offx, ky + offy); } Index: trunk/src/com/kitfox/svg/pathcmd/QuadraticSmooth.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/QuadraticSmooth.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/QuadraticSmooth.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -44,4 +53,9 @@ } + public String toString() + { + return "T " + x + " " + y; + } + public QuadraticSmooth(boolean isRelative, float x, float y) { super(isRelative); @@ -53,11 +67,11 @@ public void appendPath(GeneralPath path, BuildHistory hist) { - float offx = isRelative ? hist.history[0].x : 0f; - float offy = isRelative ? hist.history[0].y : 0f; + float offx = isRelative ? hist.lastPoint.x : 0f; + float offy = isRelative ? hist.lastPoint.y : 0f; - float oldKx = hist.history.length >= 2 ? hist.history[1].x : hist.history[0].x; - float oldKy = hist.history.length >= 2 ? hist.history[1].y : hist.history[0].y; - float oldX = hist.history[0].x; - float oldY = hist.history[0].y; + float oldKx = hist.lastKnot.x; + float oldKy = hist.lastKnot.y; + float oldX = hist.lastPoint.x; + float oldY = hist.lastPoint.y; //Calc knot as reflection of old knot float kx = oldX * 2f - oldKx; @@ -65,5 +79,6 @@ path.quadTo(kx, ky, x + offx, y + offy); - hist.setPointAndKnot(x + offx, y + offy, kx, ky); + hist.setLastPoint(x + offx, y + offy); + hist.setLastKnot(kx, ky); } Index: trunk/src/com/kitfox/svg/pathcmd/Terminal.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/Terminal.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/Terminal.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -43,4 +52,9 @@ } + public String toString() + { + return "Z"; + } + // public void appendPath(ExtendedGeneralPath path, BuildHistory hist) @@ -48,5 +62,6 @@ { path.closePath(); - hist.setPoint(hist.start.x, hist.start.y); + hist.setLastPoint(hist.startPoint.x, hist.startPoint.y); + hist.setLastKnot(hist.startPoint.x, hist.startPoint.y); } Index: trunk/src/com/kitfox/svg/pathcmd/Vertical.java =================================================================== --- trunk/src/com/kitfox/svg/pathcmd/Vertical.java (revision 4256) +++ trunk/src/com/kitfox/svg/pathcmd/Vertical.java (revision 6002) @@ -1,25 +1,34 @@ /* - * MoveTo.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, 8:40 PM @@ -43,4 +52,9 @@ } + public String toString() + { + return "V " + y; + } + public Vertical(boolean isRelative, float y) { super(isRelative); @@ -51,9 +65,10 @@ public void appendPath(GeneralPath path, BuildHistory hist) { - float offx = hist.history[0].x; - float offy = isRelative ? hist.history[0].y : 0f; + float offx = hist.lastPoint.x; + float offy = isRelative ? hist.lastPoint.y : 0f; path.lineTo(offx, y + offy); - hist.setPoint(offx, y + offy); + hist.setLastPoint(offx, y + offy); + hist.setLastKnot(offx, y + offy); }