Ignore:
Timestamp:
2013-06-11T01:01:28+02:00 (11 years ago)
Author:
Don-vip
Message:

fix #8742 - update svgsalamander to release 0.1.18+patch (fix bug SVGSALAMANDER-26) -> allow to open more SVG files

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/com/kitfox/svg/Path.java

    r4256 r6002  
    11/*
    2  * Rect.java
     2 * SVG Salamander
     3 * Copyright (c) 2004, Mark McKay
     4 * All rights reserved.
    35 *
     6 * Redistribution and use in source and binary forms, with or
     7 * without modification, are permitted provided that the following
     8 * conditions are met:
    49 *
    5  *  The Salamander Project - 2D and 3D graphics libraries in Java
    6  *  Copyright (C) 2004 Mark McKay
     10 *   - Redistributions of source code must retain the above
     11 *     copyright notice, this list of conditions and the following
     12 *     disclaimer.
     13 *   - Redistributions in binary form must reproduce the above
     14 *     copyright notice, this list of conditions and the following
     15 *     disclaimer in the documentation and/or other materials
     16 *     provided with the distribution.
    717 *
    8  *  This library is free software; you can redistribute it and/or
    9  *  modify it under the terms of the GNU Lesser General Public
    10  *  License as published by the Free Software Foundation; either
    11  *  version 2.1 of the License, or (at your option) any later version.
    12  *
    13  *  This library is distributed in the hope that it will be useful,
    14  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
    15  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    16  *  Lesser General Public License for more details.
    17  *
    18  *  You should have received a copy of the GNU Lesser General Public
    19  *  License along with this library; if not, write to the Free Software
    20  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    21  *
    22  *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
    23  *  projects can be found at http://www.kitfox.com
     18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
     21 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
     22 * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
     23 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
     24 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
     25 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
     26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
     27 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
     29 * OF THE POSSIBILITY OF SUCH DAMAGE.
     30 *
     31 * Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
     32 * projects can be found at http://www.kitfox.com
    2433 *
    2534 * Created on January 26, 2004, 5:25 PM
    2635 */
    27 
    2836package com.kitfox.svg;
    2937
    3038import com.kitfox.svg.xml.StyleAttribute;
    31 import java.awt.*;
    32 import java.awt.geom.*;
    33 
    34 import com.kitfox.svg.pathcmd.*;
    35 import com.kitfox.svg.xml.*;
    36 import org.xml.sax.*;
     39import java.awt.Graphics2D;
     40import java.awt.Shape;
     41import java.awt.geom.GeneralPath;
     42import java.awt.geom.Rectangle2D;
    3743
    3844//import org.apache.batik.ext.awt.geom.ExtendedGeneralPath;
    39 
    4045/**
    4146 * @author Mark McKay
    4247 * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
    4348 */
    44 public class Path extends ShapeElement {
     49public class Path extends ShapeElement
     50{
    4551
     52    public static final String TAG_NAME = "path";
    4653//    PathCommand[] commands = null;
    47 
    4854    int fillRule = GeneralPath.WIND_NON_ZERO;
    4955    String d = "";
    … …  
    5157    GeneralPath path;
    5258
    53     /** Creates a new instance of Rect */
    54     public Path() {
     59    /**
     60     * Creates a new instance of Rect
     61     */
     62    public Path()
     63    {
    5564    }
    5665
    57     /*
    58     public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent)
     66    public String getTagName()
    5967    {
    60                 //Load style string
    61         super.loaderStartElement(helper, attrs, parent);
     68        return TAG_NAME;
     69    }
    6270
    63         StyleAttribute styleAttrib = getStyle("fill-rule");
    64         String fillRule = (styleAttrib == null) ? "nonzero" : styleAttrib.getStringValue();
    65        
    66         String d = attrs.getValue("d");
    67         path = buildPath(d, fillRule.equals("evenodd") ? GeneralPath.WIND_EVEN_ODD : GeneralPath.WIND_NON_ZERO);
    68     }
    69     */
    70    
    7171    protected void build() throws SVGException
    7272    {
    7373        super.build();
    74        
     74
    7575        StyleAttribute sty = new StyleAttribute();
    76        
    77    
    78         String fillRuleStrn  = (getStyle(sty.setName("fill-rule"))) ? sty.getStringValue() : "nonzero";
     76
     77
     78        String fillRuleStrn = (getStyle(sty.setName("fill-rule"))) ? sty.getStringValue() : "nonzero";
    7979        fillRule = fillRuleStrn.equals("evenodd") ? GeneralPath.WIND_EVEN_ODD : GeneralPath.WIND_NON_ZERO;
    80        
    81 //        String d = "";
    82         if (getPres(sty.setName("d"))) d = sty.getStringValue();
    8380
    84 //System.err.println(d);
    85        
     81        if (getPres(sty.setName("d")))
     82        {
     83            d = sty.getStringValue();
     84        }
     85
    8686        path = buildPath(d, fillRule);
    87        
    88 //System.err.println(d);
    8987    }
    90    
     88
    9189    public void render(Graphics2D g) throws SVGException
    9290    {
    … …  
    107105
    108106    /**
    109      * Updates all attributes in this diagram associated with a time event.
    110      * Ie, all attributes with track information.
     107     * Updates all attributes in this diagram associated with a time event. Ie,
     108     * all attributes with track information.
     109     *
    111110     * @return - true if this node has changed state as a result of the time
    112111     * update
    … …  
    120119        StyleAttribute sty = new StyleAttribute();
    121120        boolean shapeChange = false;
    122        
     121
    123122        if (getStyle(sty.setName("fill-rule")))
    124123        {
    125             int newVal = sty.getStringValue().equals("evenodd") 
    126                 ? GeneralPath.WIND_EVEN_ODD 
     124            int newVal = sty.getStringValue().equals("evenodd")
     125                ? GeneralPath.WIND_EVEN_ODD
    127126                : GeneralPath.WIND_NON_ZERO;
    128127            if (newVal != fillRule)
    … …  
    132131            }
    133132        }
    134        
     133
    135134        if (getPres(sty.setName("d")))
    136135        {
    … …  
    142141            }
    143142        }
    144        
     143
    145144        if (shapeChange)
    146145        {
    … …  
    149148//            return true;
    150149        }
    151        
     150
    152151        return changeState || shapeChange;
    153152    }
Note: See TracChangeset for help on using the changeset viewer.