Changeset 8083 in josm for trunk/src/com/kitfox

Timestamp:

2015-02-18T15:49:56+01:00 (10 years ago)

Author:

bastiK

Message:

update svgsalamander to r200

Location:

trunk/src/com/kitfox/svg

Files:

• Font.java (modified) (1 diff)
• FontFace.java (modified) (2 diffs)
• Group.java (modified) (1 diff)
• ImageSVG.java (modified) (1 diff)
• Marker.java (modified) (2 diffs)
• MissingGlyph.java (modified) (2 diffs)
• SVGDisplayPanel.java (deleted)
• SVGElement.java (modified) (1 diff)
• Text.java (modified) (12 diffs)
• Tspan.java (modified) (5 diffs)
• util (added)
• util/FontSystem.java (added)
• util/TextBuilder.java (added)

trunk/src/com/kitfox/svg/Font.java

@@ -144 +144 @@
     }
 
+    public void setFontFace(FontFace face)
+    {
+        fontFace = face;
+    }
+
     public MissingGlyph getGlyph(String unicode)
     {

trunk/src/com/kitfox/svg/FontFace.java

@@ -54 +54 @@
      * Em size of coordinate system font is defined in
      */
-    int unitsPerEm = 1000;
-    int ascent = -1;
-    int descent = -1;
-    int accentHeight = -1;
-    int underlinePosition = -1;
-    int underlineThickness = -1;
-    int strikethroughPosition = -1;
-    int strikethroughThickness = -1;
-    int overlinePosition = -1;
-    int overlineThickness = -1;
+    private int unitsPerEm = 1000;
+    private int ascent = -1;
+    private int descent = -1;
+    private int accentHeight = -1;
+    private int underlinePosition = -1;
+    private int underlineThickness = -1;
+    private int strikethroughPosition = -1;
+    private int strikethroughThickness = -1;
+    private int overlinePosition = -1;
+    private int overlineThickness = -1;
 
     /**
@@ -234 +234 @@
         return false;
     }
+
+    /**
+     * @param unitsPerEm the unitsPerEm to set
+     */
+    public void setUnitsPerEm(int unitsPerEm)
+    {
+        this.unitsPerEm = unitsPerEm;
+    }
+
+    /**
+     * @param ascent the ascent to set
+     */
+    public void setAscent(int ascent)
+    {
+        this.ascent = ascent;
+    }
+
+    /**
+     * @param descent the descent to set
+     */
+    public void setDescent(int descent)
+    {
+        this.descent = descent;
+    }
+
+    /**
+     * @param accentHeight the accentHeight to set
+     */
+    public void setAccentHeight(int accentHeight)
+    {
+        this.accentHeight = accentHeight;
+    }
+
+    /**
+     * @param underlinePosition the underlinePosition to set
+     */
+    public void setUnderlinePosition(int underlinePosition)
+    {
+        this.underlinePosition = underlinePosition;
+    }
+
+    /**
+     * @param underlineThickness the underlineThickness to set
+     */
+    public void setUnderlineThickness(int underlineThickness)
+    {
+        this.underlineThickness = underlineThickness;
+    }
+
+    /**
+     * @param strikethroughPosition the strikethroughPosition to set
+     */
+    public void setStrikethroughPosition(int strikethroughPosition)
+    {
+        this.strikethroughPosition = strikethroughPosition;
+    }
+
+    /**
+     * @param strikethroughThickness the strikethroughThickness to set
+     */
+    public void setStrikethroughThickness(int strikethroughThickness)
+    {
+        this.strikethroughThickness = strikethroughThickness;
+    }
+
+    /**
+     * @param overlinePosition the overlinePosition to set
+     */
+    public void setOverlinePosition(int overlinePosition)
+    {
+        this.overlinePosition = overlinePosition;
+    }
+
+    /**
+     * @param overlineThickness the overlineThickness to set
+     */
+    public void setOverlineThickness(int overlineThickness)
+    {
+        this.overlineThickness = overlineThickness;
+    }
 }

trunk/src/com/kitfox/svg/Group.java

@@ -150 +150 @@
         //Don't process if not visible
         StyleAttribute styleAttrib = new StyleAttribute();
-        if (getStyle(styleAttrib.setName("visibility")))
-        {
-            if (!styleAttrib.getStringValue().equals("visible"))
+        //Visibility can be overridden by children
+
+        if (getStyle(styleAttrib.setName("display")))
+        {
+            if (styleAttrib.getStringValue().equals("none"))
             {
                 return;
             }
         }
-
+        
         //Do not process offscreen groups
         boolean ignoreClip = diagram.ignoringClipHeuristic();

trunk/src/com/kitfox/svg/ImageSVG.java

@@ -207 +207 @@
         {
             if (!styleAttrib.getStringValue().equals("visible"))
+            {
+                return;
+            }
+        }
+
+        if (getStyle(styleAttrib.setName("display")))
+        {
+            if (styleAttrib.getStringValue().equals("none"))
             {
                 return;

trunk/src/com/kitfox/svg/Marker.java

@@ -56 +56 @@
     float refX;
     float refY;
-    float markerWidth = 3;
-    float markerHeight = 3;
+    float markerWidth = 1;
+    float markerHeight = 1;
     float orient = Float.NaN;
     boolean markerUnitsStrokeWidth = true; //if set to false 'userSpaceOnUse' is assumed
@@ -196 +196 @@
         boolean changeState = super.updateTime(curTime);
 
+        build();
+        
         //Marker properties do not change
         return changeState;

trunk/src/com/kitfox/svg/MissingGlyph.java

@@ -59 +59 @@
     
     //We may define a path
-    Shape path = null;
+    private Shape path = null;
     //Alternately, we may have child graphical elements
-    int horizAdvX = -1;  //Inherits font's value if not set
-    int vertOriginX = -1;  //Inherits font's value if not set
-    int vertOriginY = -1;  //Inherits font's value if not set
-    int vertAdvY = -1;  //Inherits font's value if not set
+    private int horizAdvX = -1;  //Inherits font's value if not set
+    private int vertOriginX = -1;  //Inherits font's value if not set
+    private int vertOriginY = -1;  //Inherits font's value if not set
+    private int vertAdvY = -1;  //Inherits font's value if not set
 
     /**
@@ -242 +242 @@
         return false;
     }
+
+    /**
+     * @param path the path to set
+     */
+    public void setPath(Shape path)
+    {
+        this.path = path;
+    }
+
+    /**
+     * @param horizAdvX the horizAdvX to set
+     */
+    public void setHorizAdvX(int horizAdvX)
+    {
+        this.horizAdvX = horizAdvX;
+    }
+
+    /**
+     * @param vertOriginX the vertOriginX to set
+     */
+    public void setVertOriginX(int vertOriginX)
+    {
+        this.vertOriginX = vertOriginX;
+    }
+
+    /**
+     * @param vertOriginY the vertOriginY to set
+     */
+    public void setVertOriginY(int vertOriginY)
+    {
+        this.vertOriginY = vertOriginY;
+    }
+
+    /**
+     * @param vertAdvY the vertAdvY to set
+     */
+    public void setVertAdvY(int vertAdvY)
+    {
+        this.vertAdvY = vertAdvY;
+    }
 }

trunk/src/com/kitfox/svg/SVGElement.java

@@ -588 +588 @@
     static public AffineTransform parseSingleTransform(String val) throws SVGException
     {
-        final Matcher matchWord = Pattern.compile("([a-zA-Z]+|-?\\d+(\\.\\d+)?|-?\\.\\d+)").matcher("");
+        final Matcher matchWord = Pattern.compile("([a-zA-Z]+|-?\\d+(\\.\\d+)?(e-?\\d+)?|-?\\.\\d+(e-?\\d+)?)").matcher("");
 
         AffineTransform retXform = new AffineTransform();

trunk/src/com/kitfox/svg/Text.java

@@ -36 +36 @@
 package com.kitfox.svg;
 
+import com.kitfox.svg.util.FontSystem;
+import com.kitfox.svg.util.TextBuilder;
 import com.kitfox.svg.xml.StyleAttribute;
 import java.awt.Graphics2D;
@@ -89 +91 @@
     int fontWeight;
 
+    float textLength = -1;
+    String lengthAdjust = "spacing";
+    
     /**
      * Creates a new instance of Stop
@@ -167 +172 @@
         {
             fontFamily = sty.getStringValue();
-        } else
+        }
+        else
         {
             fontFamily = "Sans Serif";
@@ -175 +181 @@
         {
             fontSize = sty.getFloatValueWithUnits();
-        } else
+        }
+        else
         {
             fontSize = 12f;
+        }
+
+        if (getStyle(sty.setName("textLength")))
+        {
+            textLength = sty.getFloatValueWithUnits();
+        }
+        else
+        {
+            textLength = -1;
+        }
+
+        if (getStyle(sty.setName("lengthAdjust")))
+        {
+            lengthAdjust = sty.getStringValue();
+        }
+        else
+        {
+            lengthAdjust = "spacing";
         }
 
@@ -235 +260 @@
         //text-rendering
 
-        buildFont();
-    }
-
-    protected void buildFont() throws SVGException
-    {
-        int style;
-        switch (fontStyle)
-        {
-            case TXST_ITALIC:
-                style = java.awt.Font.ITALIC;
-                break;
-            default:
-                style = java.awt.Font.PLAIN;
-                break;
-        }
-
-        int weight;
-        switch (fontWeight)
-        {
-            case TXWE_BOLD:
-            case TXWE_BOLDER:
-                weight = java.awt.Font.BOLD;
-                break;
-            default:
-                weight = java.awt.Font.PLAIN;
-                break;
-        }
+        buildText();
+    }
+
+    protected void buildText() throws SVGException
+    {
 
         //Get font
@@ -269 +272 @@
 //            System.err.println("Could not load font");
 
-            java.awt.Font sysFont = new java.awt.Font(fontFamily, style | weight, (int) fontSize);
-            buildSysFont(sysFont);
-            return;
+            font = new FontSystem(fontFamily, fontStyle, fontWeight, (int)fontSize);
+//            java.awt.Font sysFont = new java.awt.Font(fontFamily, style | weight, (int)fontSize);
+//            buildSysFont(sysFont);
+//            return;
         }
 
@@ -288 +292 @@
 
 //        AffineTransform oldXform = g.getTransform();
+//        TextBuilder builder = new TextBuilder();
+//        
+//        for (Iterator it = content.iterator(); it.hasNext();)
+//        {
+//            Object obj = it.next();
+//
+//            if (obj instanceof String)
+//            {
+//                String text = (String) obj;
+//                if (text != null)
+//                {
+//                    text = text.trim();
+//                }
+//                
+//                for (int i = 0; i < text.length(); i++)
+//                {
+//                    String unicode = text.substring(i, i + 1);
+//                    MissingGlyph glyph = font.getGlyph(unicode);
+//                    
+//                    builder.appendGlyph(glyph);
+//                }
+//            }
+//            else if (obj instanceof Tspan)
+//            {
+//                Tspan tspan = (Tspan)obj;
+//                tspan.buildGlyphs(builder);
+//            }
+//        }
+//
+//        builder.formatGlyphs();
+        
+        
+
+                
+                
+        
+        
+        
         AffineTransform xform = new AffineTransform();
 
@@ -328 +370 @@
 
                 strokeWidthScalar = 1f;
-            } else if (obj instanceof Tspan)
-            {
-                Tspan tspan = (Tspan) obj;
-
-                xform.setToIdentity();
-                xform.setToTranslation(cursorX, cursorY);
-                xform.scale(fontScale, fontScale);
-//                tspan.setCursorX(cursorX);
-//                tspan.setCursorY(cursorY);
-
-                Shape tspanShape = tspan.getShape();
-                tspanShape = xform.createTransformedShape(tspanShape);
-                textPath.append(tspanShape, false);
-//                tspan.render(g);
-//                cursorX = tspan.getCursorX();
-//                cursorY = tspan.getCursorY();
-            }
-
-        }
-
-        switch (textAnchor)
-        {
-            case TXAN_MIDDLE:
-            {
-                AffineTransform at = new AffineTransform();
-                at.translate(-textPath.getBounds().getWidth() / 2, 0);
-                textPath.transform(at);
-                break;
-            }
-            case TXAN_END:
-            {
-                AffineTransform at = new AffineTransform();
-                at.translate(-textPath.getBounds().getWidth(), 0);
-                textPath.transform(at);
-                break;
-            }
-        }
-    }
-
-    private void buildSysFont(java.awt.Font font) throws SVGException
-    {
-        GeneralPath textPath = new GeneralPath();
-        textShape = textPath;
-
-        float cursorX = x, cursorY = y;
-
-//        FontMetrics fm = g.getFontMetrics(font);
-        FontRenderContext frc = new FontRenderContext(null, true, true);
-
-//        FontFace fontFace = font.getFontFace();
-        //int unitsPerEm = fontFace.getUnitsPerEm();
-//        int ascent = fm.getAscent();
-//        float fontScale = fontSize / (float)ascent;
-
-//        AffineTransform oldXform = g.getTransform();
-        AffineTransform xform = new AffineTransform();
-
-        for (Iterator it = content.iterator(); it.hasNext();)
-        {
-            Object obj = it.next();
-
-            if (obj instanceof String)
-            {
-                String text = (String)obj;
-                text = text.trim();
-
-                Shape textShape = font.createGlyphVector(frc, text).getOutline(cursorX, cursorY);
-                textPath.append(textShape, false);
-//                renderShape(g, textShape);
-//                g.drawString(text, cursorX, cursorY);
-
-                Rectangle2D rect = font.getStringBounds(text, frc);
-                cursorX += (float) rect.getWidth();
-            } else if (obj instanceof Tspan)
-            {
-                /*
-                 Tspan tspan = (Tspan)obj;
-                 
-                 xform.setToIdentity();
-                 xform.setToTranslation(cursorX, cursorY);
-                 
-                 Shape tspanShape = tspan.getShape();
-                 tspanShape = xform.createTransformedShape(tspanShape);
-                 textArea.add(new Area(tspanShape));
-                 
-                 cursorX += tspanShape.getBounds2D().getWidth();
-                 */
-
-
+            }
+            else if (obj instanceof Tspan)
+            {
+//                Tspan tspan = (Tspan) obj;
+//
+//                xform.setToIdentity();
+//                xform.setToTranslation(cursorX, cursorY);
+//                xform.scale(fontScale, fontScale);
+////                tspan.setCursorX(cursorX);
+////                tspan.setCursorY(cursorY);
+//
+//                Shape tspanShape = tspan.getShape();
+//                tspanShape = xform.createTransformedShape(tspanShape);
+//                textPath.append(tspanShape, false);
+////                tspan.render(g);
+////                cursorX = tspan.getCursorX();
+////                cursorY = tspan.getCursorY();
+                
+                
                 Tspan tspan = (Tspan)obj;
                 Point2D cursor = new Point2D.Float(cursorX, cursorY);
@@ -426 +398 @@
                 cursorX = (float)cursor.getX();
                 cursorY = (float)cursor.getY();
-
-            }
+                
+            }
+
         }
 
@@ -442 +415 @@
             {
                 AffineTransform at = new AffineTransform();
-                at.translate(-Math.ceil(textPath.getBounds().getWidth()), 0);
+                at.translate(-textPath.getBounds().getWidth(), 0);
                 textPath.transform(at);
                 break;
@@ -448 +421 @@
         }
     }
+
+//    private void buildSysFont(java.awt.Font font) throws SVGException
+//    {
+//        GeneralPath textPath = new GeneralPath();
+//        textShape = textPath;
+//
+//        float cursorX = x, cursorY = y;
+//
+////        FontMetrics fm = g.getFontMetrics(font);
+//        FontRenderContext frc = new FontRenderContext(null, true, true);
+//
+////        FontFace fontFace = font.getFontFace();
+//        //int unitsPerEm = fontFace.getUnitsPerEm();
+////        int ascent = fm.getAscent();
+////        float fontScale = fontSize / (float)ascent;
+//
+////        AffineTransform oldXform = g.getTransform();
+//        AffineTransform xform = new AffineTransform();
+//
+//        for (Iterator it = content.iterator(); it.hasNext();)
+//        {
+//            Object obj = it.next();
+//
+//            if (obj instanceof String)
+//            {
+//                String text = (String)obj;
+//                text = text.trim();
+//
+//                Shape textShape = font.createGlyphVector(frc, text).getOutline(cursorX, cursorY);
+//                textPath.append(textShape, false);
+////                renderShape(g, textShape);
+////                g.drawString(text, cursorX, cursorY);
+//
+//                Rectangle2D rect = font.getStringBounds(text, frc);
+//                cursorX += (float) rect.getWidth();
+//            } else if (obj instanceof Tspan)
+//            {
+//                /*
+//                 Tspan tspan = (Tspan)obj;
+//                 
+//                 xform.setToIdentity();
+//                 xform.setToTranslation(cursorX, cursorY);
+//                 
+//                 Shape tspanShape = tspan.getShape();
+//                 tspanShape = xform.createTransformedShape(tspanShape);
+//                 textArea.add(new Area(tspanShape));
+//                 
+//                 cursorX += tspanShape.getBounds2D().getWidth();
+//                 */
+//
+//
+//                Tspan tspan = (Tspan)obj;
+//                Point2D cursor = new Point2D.Float(cursorX, cursorY);
+////                tspan.setCursorX(cursorX);
+////                tspan.setCursorY(cursorY);
+//                tspan.appendToShape(textPath, cursor);
+////                cursorX = tspan.getCursorX();
+////                cursorY = tspan.getCursorY();
+//                cursorX = (float)cursor.getX();
+//                cursorY = (float)cursor.getY();
+//
+//            }
+//        }
+//
+//        switch (textAnchor)
+//        {
+//            case TXAN_MIDDLE:
+//            {
+//                AffineTransform at = new AffineTransform();
+//                at.translate(-textPath.getBounds().getWidth() / 2, 0);
+//                textPath.transform(at);
+//                break;
+//            }
+//            case TXAN_END:
+//            {
+//                AffineTransform at = new AffineTransform();
+//                at.translate(-Math.ceil(textPath.getBounds().getWidth()), 0);
+//                textPath.transform(at);
+//                break;
+//            }
+//        }
+//    }
 
     public void render(Graphics2D g) throws SVGException
@@ -502 +557 @@
         }
 
+        if (getStyle(sty.setName("textLength")))
+        {
+            textLength = sty.getFloatValueWithUnits();
+        }
+        else
+        {
+            textLength = -1;
+        }
+
+        if (getStyle(sty.setName("lengthAdjust")))
+        {
+            lengthAdjust = sty.getStringValue();
+        }
+        else
+        {
+            lengthAdjust = "spacing";
+        }
+
         if (getPres(sty.setName("font-family")))
         {

trunk/src/com/kitfox/svg/Tspan.java

@@ -36 +36 @@
 package com.kitfox.svg;
 
+import com.kitfox.svg.util.FontSystem;
 import com.kitfox.svg.xml.StyleAttribute;
 import java.awt.Graphics2D;
@@ -168 +169 @@
     public void appendToShape(GeneralPath addShape, Point2D cursor) throws SVGException
     {
-//        if (x != null)
-//        {
-//            cursorX = x[0];
-//        } else if (dx != null)
-//        {
-//            cursorX += dx[0];
-//        }
-//
-//        if (y != null)
-//        {
-//            cursorY = y[0];
-//        } else if (dy != null)
-//        {
-//            cursorY += dy[0];
-//        }
-
         StyleAttribute sty = new StyleAttribute();
 
@@ -203 +188 @@
         {
             letterSpacing = sty.getFloatValueWithUnits();
+        }
+
+        int fontStyle = 0;
+        if (getStyle(sty.setName("font-style")))
+        {
+            String s = sty.getStringValue();
+            if ("normal".equals(s))
+            {
+                fontStyle = Text.TXST_NORMAL;
+            } else if ("italic".equals(s))
+            {
+                fontStyle = Text.TXST_ITALIC;
+            } else if ("oblique".equals(s))
+            {
+                fontStyle = Text.TXST_OBLIQUE;
+            }
+        } else
+        {
+            fontStyle = Text.TXST_NORMAL;
+        }
+
+        int fontWeight = 0;
+        if (getStyle(sty.setName("font-weight")))
+        {
+            String s = sty.getStringValue();
+            if ("normal".equals(s))
+            {
+                fontWeight = Text.TXWE_NORMAL;
+            } else if ("bold".equals(s))
+            {
+                fontWeight = Text.TXWE_BOLD;
+            }
+        } else
+        {
+            fontWeight = Text.TXWE_NORMAL;
         }
 
@@ -210 +230 @@
         if (font == null)
         {
-            addShapeSysFont(addShape, font, fontFamily, fontSize, letterSpacing, cursor);
-            return;
+            font = new FontSystem(fontFamily, fontStyle, fontWeight, (int)fontSize);
+//            addShapeSysFont(addShape, font, fontFamily, fontSize, letterSpacing, cursor);
+//            return;
         }
 
@@ -275 +296 @@
     }
 
-    private void addShapeSysFont(GeneralPath addShape, Font font,
-        String fontFamily, float fontSize, float letterSpacing, Point2D cursor)
-    {
-
-        java.awt.Font sysFont = new java.awt.Font(fontFamily, java.awt.Font.PLAIN, (int) fontSize);
-
-        FontRenderContext frc = new FontRenderContext(null, true, true);
-        String renderText = this.text.trim();
-
-        AffineTransform xform = new AffineTransform();
-
-        float cursorX = (float)cursor.getX();
-        float cursorY = (float)cursor.getY();
-//        int i = 0;
-        for (int i = 0; i < renderText.length(); i++)
-        {
-            if (x != null && i < x.length)
-            {
-                cursorX = x[i];
-            } else if (dx != null && i < dx.length)
-            {
-                cursorX += dx[i];
-            }
-
-            if (y != null && i < y.length)
-            {
-                cursorY = y[i];
-            } else if (dy != null && i < dy.length)
-            {
-                cursorY += dy[i];
-            }
-//            i++;
-            
-            xform.setToIdentity();
-            xform.setToTranslation(cursorX, cursorY);
-            if (rotate != null)
-            {
-                xform.rotate(rotate[Math.min(i, rotate.length - 1)]);
-            }
-
-//            String unicode = renderText.substring(i, i + 1);
-            GlyphVector textVector = sysFont.createGlyphVector(frc, renderText.substring(i, i + 1));
-            Shape glyphOutline = textVector.getGlyphOutline(0);
-            GlyphMetrics glyphMetrics = textVector.getGlyphMetrics(0);
-
-            glyphOutline = xform.createTransformedShape(glyphOutline);
-            addShape.append(glyphOutline, false);
-
-
-//            cursorX += fontScale * glyph.getHorizAdvX() + letterSpacing;
-            cursorX += glyphMetrics.getAdvance() + letterSpacing;
-        }
-        
-        cursor.setLocation(cursorX, cursorY);
-    }
+//    private void addShapeSysFont(GeneralPath addShape, Font font,
+//        String fontFamily, float fontSize, float letterSpacing, Point2D cursor)
+//    {
+//
+//        java.awt.Font sysFont = new java.awt.Font(fontFamily, java.awt.Font.PLAIN, (int) fontSize);
+//
+//        FontRenderContext frc = new FontRenderContext(null, true, true);
+//        String renderText = this.text.trim();
+//
+//        AffineTransform xform = new AffineTransform();
+//
+//        float cursorX = (float)cursor.getX();
+//        float cursorY = (float)cursor.getY();
+////        int i = 0;
+//        for (int i = 0; i < renderText.length(); i++)
+//        {
+//            if (x != null && i < x.length)
+//            {
+//                cursorX = x[i];
+//            } else if (dx != null && i < dx.length)
+//            {
+//                cursorX += dx[i];
+//            }
+//
+//            if (y != null && i < y.length)
+//            {
+//                cursorY = y[i];
+//            } else if (dy != null && i < dy.length)
+//            {
+//                cursorY += dy[i];
+//            }
+////            i++;
+//            
+//            xform.setToIdentity();
+//            xform.setToTranslation(cursorX, cursorY);
+//            if (rotate != null)
+//            {
+//                xform.rotate(rotate[Math.min(i, rotate.length - 1)]);
+//            }
+//
+////            String unicode = renderText.substring(i, i + 1);
+//            GlyphVector textVector = sysFont.createGlyphVector(frc, renderText.substring(i, i + 1));
+//            Shape glyphOutline = textVector.getGlyphOutline(0);
+//            GlyphMetrics glyphMetrics = textVector.getGlyphMetrics(0);
+//
+//            glyphOutline = xform.createTransformedShape(glyphOutline);
+//            addShape.append(glyphOutline, false);
+//
+//
+////            cursorX += fontScale * glyph.getHorizAdvX() + letterSpacing;
+//            cursorX += glyphMetrics.getAdvance() + letterSpacing;
+//        }
+//        
+//        cursor.setLocation(cursorX, cursorY);
+//    }
 
     public void render(Graphics2D g) throws SVGException