X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scenegraph%2Fsrc%2Forg%2Fsimantics%2Fscenegraph%2Fg2d%2Fnodes%2FSVGNode.java;h=f8f692e1d88b70ee080c6adb1591ba5a24d3a70c;hp=d21ba1f16a73c91ee9517244492bfa6e2dccec2e;hb=81e3522f6cb5822f701b66a9fbf9be9f9bf97ec9;hpb=e1c5d8d7c5589cfa4a254e167f4d9f0e66df6bf7

diff --git a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/SVGNode.java b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/SVGNode.java
index d21ba1f16..f8f692e1d 100644
--- a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/SVGNode.java
+++ b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/SVGNode.java
@@ -17,6 +17,8 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.lang.ref.WeakReference;
 import java.math.BigInteger;
 import java.net.URI;
@@ -31,19 +33,35 @@ import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
 import org.simantics.scenegraph.ExportableWidget.RasterOutputWidget;
 import org.simantics.scenegraph.LoaderNode;
 import org.simantics.scenegraph.ScenegraphUtils;
 import org.simantics.scenegraph.g2d.G2DNode;
+import org.simantics.scenegraph.g2d.G2DRenderingHints;
 import org.simantics.scenegraph.utils.BufferedImage;
 import org.simantics.scenegraph.utils.G2DUtils;
 import org.simantics.scenegraph.utils.InitValueSupport;
 import org.simantics.scenegraph.utils.MipMapBufferedImage;
 import org.simantics.scenegraph.utils.MipMapVRamBufferedImage;
+import org.simantics.scenegraph.utils.SVGPassthruShape;
 import org.simantics.scenegraph.utils.VRamBufferedImage;
 import org.simantics.scl.runtime.function.Function1;
 import org.simantics.scl.runtime.function.Function2;
 import org.simantics.utils.threads.AWTThread;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 
 import com.kitfox.svg.RenderableElement;
 import com.kitfox.svg.SVGCache;
@@ -61,6 +79,7 @@ public class SVGNode extends G2DNode implements InitValueSupport, LoaderNode {
 
 	private static final long serialVersionUID = 8508750881358776559L;
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(SVGNode.class);
     protected String          data             = null;
     protected String          defaultData      = null;
     protected Point           targetSize       = null;
@@ -95,6 +114,7 @@ public class SVGNode extends G2DNode implements InitValueSupport, LoaderNode {
         SVGDiagram d = diagramCache;
         if (d != null) {
             diagramCache = null;
+            dataHash = null;
             SVGUniverse univ = SVGCache.getSVGUniverse();
             if (univ.decRefCountAndClear(d.getXMLBase()) == 0) {
                 // Cleared!
@@ -115,6 +135,7 @@ public class SVGNode extends G2DNode implements InitValueSupport, LoaderNode {
         }
         this.data = cached;
         this.defaultData = cached;
+        cleanDiagramCache();
     }
 
     @SyncField("targetSize")
@@ -150,17 +171,25 @@ public class SVGNode extends G2DNode implements InitValueSupport, LoaderNode {
         if (data == null)
             return; // Not initialized
 
-        if (!data.equals(documentCache) || diagramCache == null || buffer == null)
-            initBuffer(g2d);
-
         AffineTransform ot = null;
         if (!transform.isIdentity()) {
             ot = g2d.getTransform();
             g2d.transform(transform);
         }
 
-        if (buffer != null)
-            buffer.paint(g2d);
+        if (g2d.getRenderingHint(G2DRenderingHints.KEY_SVG_PASSTHRU) == Boolean.TRUE) {
+            SVGPassthruShape.resetG2D(g2d);
+            String svg = assignments.isEmpty() ? data : applyAssigments(data, assignments);
+            if (svg != null) {
+                g2d.fill(new SVGPassthruShape(svg));
+            }
+        } else {
+            if (!data.equals(documentCache) || diagramCache == null || buffer == null)
+                initBuffer(g2d);
+
+            if (buffer != null)
+                buffer.paint(g2d);
+        }
 
         if (ot != null)
             g2d.setTransform(ot);
@@ -184,7 +213,7 @@ public class SVGNode extends G2DNode implements InitValueSupport, LoaderNode {
                     diagramCache = null;
                 }
 
-                // Lets check for rootAssignment that contributes the whole SVG 
+                // Lets check for rootAssignment that contributes the whole SVG
                 SVGNodeAssignment rootAssignment = null;
                 if (!assignments.isEmpty()) {
                     for (SVGNodeAssignment ass : assignments) {
@@ -256,12 +285,76 @@ public class SVGNode extends G2DNode implements InitValueSupport, LoaderNode {
         return dataHash;
     }
 
+    private static DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+    static {
+        dbf.setValidating(false);
+        try {
+            dbf.setFeature("http://xml.org/sax/features/namespaces", false);
+            dbf.setFeature("http://xml.org/sax/features/validation", false);
+            dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
+            dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        } catch (ParserConfigurationException e) {
+            // Nothing to do
+        }
+    }
+
+    // Notice: Remember to change both implementations of applyAssigments when modifying the functionality.
+    protected static String applyAssigments(String svg, List<SVGNodeAssignment> assignments) {
+        try {
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            Document doc = db.parse(new InputSource(new StringReader(svg)));
+
+            NodeList entries = doc.getElementsByTagName("*");
+            for (int i=0; i<entries.getLength(); i++) {
+                Element element = (Element) entries.item(i);
+                if (element.hasAttribute("id")) {
+                    element.setIdAttribute("id", true);
+                }
+            }
+            for (SVGNodeAssignment ass : assignments) {
+                Element e = doc.getElementById(ass.elementId);
+                if (e != null) {
+                    if ("$text".equals(ass.attributeNameOrId)) {
+                        if (e.getTagName().equals("tspan")) {
+                            if (ass.value.trim().isEmpty()) {
+                                e.setTextContent("-");
+                            } else {
+                                e.setTextContent(ass.value);
+                            }
+                        }
+                    } else if (ass.attributeNameOrId.startsWith("#")) {
+                        e.setAttribute(ass.attributeNameOrId.substring(1), ass.value);
+                    } else {
+                        e.setAttribute(ass.attributeNameOrId, ass.value);
+                    }
+                } else {
+                    LOGGER.warn("Element with id='" + ass.elementId + " was not found.");
+                }
+            }
+
+            DOMSource domSource = new DOMSource(doc);
+            StringWriter writer = new StringWriter();
+            StreamResult result = new StreamResult(writer);
+            TransformerFactory tf = TransformerFactory.newInstance();
+            Transformer transformer = tf.newTransformer();
+            transformer.transform(domSource, result);
+            return writer.toString();
+
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    // Notice: Remember to change both implementations of applyAssigments when modifying the functionality.
     protected boolean applyAssignments(SVGDiagram diagram, List<SVGNodeAssignment> assignments) throws SVGException {
         if (assignments.isEmpty())
             return false;
 
         boolean changed = false;
 
+        // Without this elements are sometimes not found by id!
+        diagram.updateTime(0);
+
         for (SVGNodeAssignment ass : assignments) {
             SVGElement e = diagram.getElement(ass.elementId);
             if (e != null) {
@@ -288,6 +381,9 @@ public class SVGNode extends G2DNode implements InitValueSupport, LoaderNode {
             }
         }
 
+        // Without this the attribute values are not correctly reflected in rendering
+        diagram.updateTime(0);
+
         return changed;
     }
 
@@ -365,7 +461,7 @@ public class SVGNode extends G2DNode implements InitValueSupport, LoaderNode {
                 URI uri = univ.loadSVG(new ByteArrayInputStream(dataBytes), digest);
                 diagramCache = univ.getDiagram(uri, false);
                 if (diagramCache != null) {
-                    SVGRoot root = diagramCache.getRoot(); 
+                    SVGRoot root = diagramCache.getRoot();
                     if (root == null) return new Rectangle2D.Double();
                     return (Rectangle2D)root.getBoundingBox().clone();
                 }
@@ -381,7 +477,7 @@ public class SVGNode extends G2DNode implements InitValueSupport, LoaderNode {
         if (!data.equals(documentCache) || diagramCache == null) {
             dataHash = parseSVG();
             if (diagramCache == null) {
-                System.err.println("UNABLE TO PARSE SVG:\n" + data);
+                LOGGER.warn("UNABLE TO PARSE SVG:\n" + data);
                 return;
             }
         }