]> gerrit.simantics Code Review - simantics/platform.git/blobdiff - bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java
Disable SCL Issue provider by default
[simantics/platform.git] / bundles / org.simantics.modeling / src / org / simantics / modeling / SCLScenegraph.java
index e0c198388e41f20a0f6848c22b2e70ae34b0ea2f..cc4489f8230812b15badd4287bae73582c47421d 100644 (file)
@@ -1,6 +1,7 @@
 package org.simantics.modeling;
 
 import java.awt.BasicStroke;
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.RenderingHints;
 import java.awt.RenderingHints.Key;
@@ -30,6 +31,8 @@ import javax.xml.transform.stream.StreamResult;
 import org.apache.batik.dom.GenericDOMImplementation;
 import org.apache.batik.svggen.SVGGeneratorContext;
 import org.apache.batik.svggen.SVGGraphics2D;
+import org.apache.batik.svggen.SVGIDGenerator;
+import org.eclipse.swt.SWT;
 import org.simantics.Simantics;
 import org.simantics.datatypes.literal.GUID;
 import org.simantics.db.ReadGraph;
@@ -45,10 +48,13 @@ import org.simantics.diagram.elements.DiagramNodeUtil;
 import org.simantics.diagram.elements.TextGridNode;
 import org.simantics.diagram.elements.TextNode;
 import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.diagram.ui.DiagramModelHints;
+import org.simantics.g2d.canvas.Hints;
 import org.simantics.g2d.canvas.ICanvasContext;
 import org.simantics.g2d.diagram.DiagramHints;
 import org.simantics.g2d.diagram.IDiagram;
 import org.simantics.g2d.diagram.handler.DataElementMap;
+import org.simantics.g2d.diagram.participant.ElementPainter.SelectionShapeNode;
 import org.simantics.g2d.diagram.participant.Selection;
 import org.simantics.g2d.element.IElement;
 import org.simantics.g2d.scenegraph.ICanvasSceneGraphProvider;
@@ -66,6 +72,7 @@ import org.simantics.scenegraph.g2d.nodes.BackgroundNode;
 import org.simantics.scenegraph.g2d.nodes.BoundsNode;
 import org.simantics.scenegraph.g2d.nodes.ConnectionNode;
 import org.simantics.scenegraph.g2d.nodes.DataNode;
+import org.simantics.scenegraph.g2d.nodes.LinkNode;
 import org.simantics.scenegraph.g2d.nodes.NavigationNode;
 import org.simantics.scenegraph.g2d.nodes.SVGNode;
 import org.simantics.scenegraph.g2d.nodes.SelectionNode;
@@ -82,6 +89,7 @@ import org.slf4j.LoggerFactory;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 public class SCLScenegraph {
@@ -91,9 +99,16 @@ public class SCLScenegraph {
        private static final String MAIN_SECTION = "main";
        private static final String SELECTION_SECTION = "selection";
        private static final String SELECTION_MASK_SECTION = "selectionMask";
-       
+
        private static final String[] ALL_SECTIONS = { MAIN_SECTION, SELECTION_SECTION, SELECTION_MASK_SECTION };
 
+       // Changed from 0.001 to 0.0001 to prevent creation of huge BufferedImage's when
+       // generating PDF from SVG. If SVG contains any transparency then Batik uses
+       // bitmap-rendering which remarkably slows things down
+       // See org.apache.batik.gvt.AbstractGraphicsNode.paint(Graphics2D) where decisions are made
+       // if AlphaComposite should be painted 
+       private static final String OPACITY = "0.0001";
+
        @Deprecated
        public static ICanvasSceneGraphProvider getICanvasSceneGraphProvider(Resource model, Resource diagram, String diagramRVI) throws DatabaseException, InterruptedException {
                ICanvasSceneGraphProvider provider = DiagramNodeUtil.loadSceneGraphProvider(model, diagram, diagramRVI);
@@ -276,6 +291,23 @@ public class SCLScenegraph {
        }
         return "No nodes in scenegraph!";
     }
+    
+    /**
+     * Returns background color of a canvasContext or null.
+     * @param ctx
+     * @return color in RGBA List<Integer> format, or null.
+     */
+    public static List<Integer> getBackgroundColor(ICanvasContext ctx) {
+       Color color = ctx.getDefaultHintContext().getHint(Hints.KEY_BACKGROUND_COLOR);
+       if (color == null)
+               return null;
+       ArrayList<Integer> rgba = new ArrayList<>(4);
+       rgba.add(color.getRed());
+       rgba.add(color.getGreen());
+       rgba.add(color.getBlue());
+       rgba.add(color.getAlpha());
+       return rgba;
+    }
 
     public static String sceneGraphTest (ICanvasContext ctx, String module, String value) {
        
@@ -370,6 +402,22 @@ public class SCLScenegraph {
                return true;
     }
 
+    
+    static class UniqueIDGenerator extends SVGIDGenerator{
+       
+       String overallId;
+       public UniqueIDGenerator(String overallId) {
+               super();
+               this.overallId = overallId;
+       }
+       
+       @Override
+       public String generateID(String prefix) {
+               return super.generateID(overallId+prefix);
+       }
+
+    }
+
        static class Generator extends SVGGraphics2D {
 
                int elemLevel = 0;
@@ -378,12 +426,19 @@ public class SCLScenegraph {
 
                public static final String svgNS = "http://www.w3.org/2000/svg";
 
-               public Generator(SVGGeneratorContext ctx, boolean joku) {
-                       super(ctx, joku);
+               public Generator(SVGGeneratorContext ctx, boolean textAsShapes) {
+                       super(ctx, textAsShapes);
                }
 
                public Generator(Document document) {
+                       this(document,null);
+               }
+               public Generator(Document document, String id) {
                        super(document);
+                       // prevent batik comment in each g-element
+                       getGeneratorContext().setComment(null);
+                       if (id != null)
+                               getGeneratorContext().setIDGenerator(new UniqueIDGenerator(id));
                }
 
                @Override
@@ -422,20 +477,7 @@ public class SCLScenegraph {
 
        }
 
-       public static Element renderSVGNode(IG2DNode node) {
-
-               // Get a DOMImplementation.
-               DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation();
-
-               // Create an instance of org.w3c.dom.Document.
-               String svgNS = "http://www.w3.org/2000/svg";
-               Document document = domImpl.createDocument(svgNS, "svg", null);
-
-               SVGGeneratorContext ctx = SVGGeneratorContext.createDefault(document);
-               ctx.setComment(null);
-
-               // Create an instance of the SVG Generator.
-               SVGGraphics2D svgGenerator = new Generator(ctx, false);
+       public static Element renderSVGNode(SVGGraphics2D svgGenerator, IG2DNode node) {
 
                try {
 
@@ -492,7 +534,11 @@ public class SCLScenegraph {
        }
 
        public static String renderSVG3(ICanvasContext ctx) {
-        return renderSVG0(ctx, p0 -> p0.stream().collect(Collectors.toMap(p1 -> p1, p2 -> p2)));
+               return renderSVG3(ctx, -1, -1);
+       }
+
+       public static String renderSVG3(ICanvasContext ctx, double width, double height) {
+        return renderSVG0(width, height, SWT.LEFT, SWT.TOP, ctx, p0 -> p0.stream().collect(Collectors.toMap(p1 -> p1, p2 -> p2)));
        }
 
     /**
@@ -513,11 +559,33 @@ public class SCLScenegraph {
      * Default no-op mapper
      */
     private static final Function1<Set<?>, Map<?, ?>> mapper = p0 -> p0.stream().collect(Collectors.toMap(p1 -> p1, p2 -> p2));
+
+    
+    /**
+     * Renders CanvasContext to SVG.
+     * @param ctx
+     * @param width Width of output image. Use -1 for autosize.
+     * @param height Height of output image. Use -1 for autosize.
+     * @param ax horizontal alignment. SWT.LEFT SWT.CENTER SWT.RIGHT are accepted values. Value is not used with autosize. 
+     * @param ay vertical alignment. SWT.TOP SWT.CENTER SWT.BOTTOM are accepted values. Value is not used with autosize.
+     * @return
+     */
+    public static String renderSVG(ICanvasContext ctx, double width, double height, int ax, int ay) {
+        return renderSVG0(width, height, ax, ay, ctx, mapper);
+    }
     
+    public static String renderSVG(ICanvasContext ctx, double width, double height) {
+        return renderSVG(ctx,width,height, SWT.LEFT, SWT.TOP);
+    }
+
     public static String renderSVG(ICanvasContext ctx) {
-        return renderSVG0(ctx, mapper);
+       return renderSVG(ctx, -1, -1, SWT.LEFT, SWT.TOP);
     }
 
+    public static String renderSVGMapIdentifiers(ICanvasContext ctx) {
+               return renderSVGMapIdentifiers(ctx, -1, -1);
+    }
+    
     /**
      * Renders ICanvasContext into SVG by mapping the SVG id's into URI based
      * GUID's
@@ -525,8 +593,8 @@ public class SCLScenegraph {
      * @param ctx
      * @return
      */
-    public static String renderSVGMapIdentifiers(ICanvasContext ctx) {
-        return renderSVG0(ctx, new Function1<Set<?>, Map<?, ?>>() {
+    public static String renderSVGMapIdentifiers(ICanvasContext ctx, double width, double height) {
+        return renderSVG0(width, height, SWT.LEFT, SWT.TOP, ctx, new Function1<Set<?>, Map<?, ?>>() {
 
             @Override
             public Map<?, ?> apply(Set<?> p0) {
@@ -610,7 +678,9 @@ public class SCLScenegraph {
        
     }
     
-       private static String renderSVG0(ICanvasContext ctx, Function1<Set<?>, Map<?, ?>> mappingFunction) {
+    
+    
+       private static String renderSVG0(double width, double height, int ax, int ay, ICanvasContext ctx, Function1<Set<?>, Map<?, ?>> mappingFunction) {
 
                // Get a DOMImplementation.
                DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation();
@@ -620,18 +690,24 @@ public class SCLScenegraph {
                Document document = domImpl.createDocument(svgNS, "svg", null);
 
                // Create an instance of the SVG Generator.
-               SVGGraphics2D svgGenerator = new Generator(document);
+               IDiagram d = ctx.getDefaultHintContext().getHint(DiagramHints.KEY_DIAGRAM);
+               Resource r = d.getHint(DiagramModelHints.KEY_DIAGRAM_RESOURCE);
+               SVGGraphics2D svgGenerator;
+               if (r != null)
+                       svgGenerator = new Generator(document,r.toString());
+               else
+                       svgGenerator = new Generator(document);
 
                RenderSVGContext result = new RenderSVGContext();
 
+               double[] matrix = new double[6];
                try {
 
             Selection selection = ctx.getAtMostOneItemOfClass(Selection.class);
             if (selection != null) {
                 // This prevents workbench selection from being left over.
                 // Also prevents scene graph crap from being left on the screen.
-               IDiagram d = ctx.getDefaultHintContext().getHint(DiagramHints.KEY_DIAGRAM);
-                selection.setSelection(0, d.getElements());
+               selection.setSelection(0, d.getElements());
             }
 
                        G2DSceneGraph sg = ctx.getSceneGraph();
@@ -642,48 +718,63 @@ public class SCLScenegraph {
                        RTreeNode rtree = NodeUtil.getNearestChildByClass(root, RTreeNode.class);
                        Rectangle2D rtreeBounds = NodeUtil.getLocalBounds(rtree);
 
-                       // nav is a node that has zooming functionalities
-                       NavigationNode nav = NodeUtil.getNearestChildByClass(root, NavigationNode.class);
-                       nav.setZoomEnabled(true);
-
-                       // fit view with the contents of rtreeBounds
-                       nav.zoomTo(rtreeBounds);
-
                        // get the bounds of the content
-                       Rectangle2D content = NodeUtil.getLocalBounds(nav);
-
-                       svgGenerator.scale(3,3);
-
+                       Rectangle2D content = rtreeBounds;
+                       
+//                     int ax = SWT.LEFT;
+//                     int ay = SWT.TOP;
+//                     int ax = SWT.CENTER;
+//                     int ay = SWT.CENTER;
+                       
+                       if (content != null) {
+                        // To account for dynamic padding of selection rectangles (5 units + stroke width)
+                   int offset = 6;
+                   
+                   double scale = width < 0 || height < 0 ? 1.0 : Math.min((width - 2*offset) / content.getWidth(), (height - 2*offset) / content.getHeight());
+               
+                   AffineTransform tr = new AffineTransform();
+                   tr.translate(offset, offset);
+                   tr.scale(scale, scale);
+                   double dx = -content.getX();
+                   double dy = -content.getY();
+                   if (width > 0.0 && height > 0.0) {
+                           if (ax == SWT.LEFT) {
+                               dx = -content.getX();
+                           } else if (ax == SWT.RIGHT) {
+                               double t = ((width - 2*offset)/scale - content.getWidth());
+                               dx = -content.getX() + t;
+                           } else {
+                               double t = ((width - 2*offset)/scale - content.getWidth()) *0.5;
+                               dx = -content.getX() + t;
+                           }
+                           if (ay == SWT.TOP) {
+                               dy = -content.getY();
+                           } else if (ay == SWT.BOTTOM) {
+                               double t = ((height - 2*offset)/scale - content.getHeight());
+                               dy = -content.getY() + t;
+                           } else {
+                               double t = ((height - 2*offset)/scale - content.getHeight()) * 0.5;
+                               dy = -content.getY() + t;
+                           }
+                   }
+                           tr.translate(dx, dy);
+                           tr.getMatrix(matrix);
+                           svgGenerator.setSVGCanvasSize(new Dimension((int)Math.ceil(scale * content.getWidth()) + 2*offset, (int)Math.ceil(scale * content.getHeight()) + 2*offset));
+                       } else {
+                           svgGenerator.setSVGCanvasSize(new Dimension(100, 100));
+                       }
+                       //svgGenerator.translate(offset, offset);
+                       //svgGenerator.scale(scale, scale);
                        // translate svgGenerator to the x and y coordinates of current content
-                       svgGenerator.translate(-1 * content.getX(), (-1 * content.getY()));
-
-                       Rectangle2D destination = new Rectangle2D.Double(0,0,1000,1000);
-                       double sx = destination.getWidth() / content.getWidth();
-                       double sy = destination.getHeight() / content.getHeight();
-                       double scale = sx < sy ? sx : sy;
-
-                       // Set svgCanvasSize to the given size parameters
-                       svgGenerator.setSVGCanvasSize(new Dimension((int)(scale * content.getWidth()), (int)(scale * content.getHeight())));
-                       svgGenerator.setClip(content);
+                       //svgGenerator.translate(-content.getX(), -content.getY());
 
-                       double trX = -1 * content.getX();
-                       double trY = -1 * content.getY();
                        
-                       // NaNs
-                       if(!Double.isFinite(trX)) trX = 0;
-                       if(!Double.isFinite(trY)) trY = 0;
+                       //svgGenerator.setClip(content);
                        
                        result.append(MAIN_SECTION, "<g class=\"symbols\">");
                        result.append(SELECTION_SECTION, "<g class=\"selections\">");
                        result.append(SELECTION_MASK_SECTION, "<g class=\"selectionMasks\">");
 
-                       result.append(ALL_SECTIONS, "<g transform=\"translate(");
-                       result.append(ALL_SECTIONS, "" + trX);
-                       result.append(ALL_SECTIONS, ", ");
-                       result.append(ALL_SECTIONS, "" + trY);
-                       result.append(ALL_SECTIONS, ")\">");
-
-                       
                        KeyVisitor keyVisitor = new KeyVisitor();
                        sg.accept(keyVisitor);
                        
@@ -691,7 +782,7 @@ public class SCLScenegraph {
                        
                        Map<?, ?> mappings = mappingFunction.apply(keys);
 
-                       IG2DNodeVisitor visitor = new PrintingVisitor(result, mappings);
+                       IG2DNodeVisitor visitor = new PrintingVisitor(svgGenerator, result, mappings);
                        
                        sg.accept(visitor);
 
@@ -700,13 +791,19 @@ public class SCLScenegraph {
                }
 
 
-               result.append(ALL_SECTIONS, "</g></g>");
+               result.append(ALL_SECTIONS, "</g>");
 
                StringBuilder res = new StringBuilder();
-               res.append("<svg width=\"100%\" height=\"100%\" stroke=\"black\">");
+               if (width > 0 && height > 0 ) {
+                       res.append("<svg width=\"" + width +"px\" height=\""+height+"px\" stroke=\"black\" xmlns=\"http://www.w3.org/2000/svg\">");
+               } else {
+                       res.append("<svg width=\"100%\" height=\"100%\" stroke=\"black\" xmlns=\"http://www.w3.org/2000/svg\">");
+               }
+               res.append("<g transform=\"matrix(").append(matrix[0]).append(",").append(matrix[1]).append(",").append(matrix[2]).append(",").append(matrix[3]).append(",").append(matrix[4]).append(",").append(matrix[5]).append(")\">");
                res.append(result.get(MAIN_SECTION));
                res.append(result.get(SELECTION_SECTION));
                res.append(result.get(SELECTION_MASK_SECTION));
+               res.append("</g>");
                res.append("</svg>");
 
 //             System.err.println(" == FINAL RESULT == ");
@@ -749,26 +846,52 @@ public class SCLScenegraph {
         HashMap<SingleElementNode,RenderSVGContext> senBuilders = new HashMap<>();
 
         private RenderSVGContext result;
+        private SVGGraphics2D svgGenerator;
 
         private Map<?, ?> mappings;
 
-        public PrintingVisitor(RenderSVGContext result, Map<?, ?> mappings) {
+        public PrintingVisitor(SVGGraphics2D svgGenerator, RenderSVGContext result, Map<?, ?> mappings) {
             this.result = result;
             this.mappings = mappings;
+            this.svgGenerator = svgGenerator;
         }
 
         private String getKey(SingleElementNode node) {
             String key;
                if(node.getKey() != null) {
-                if (mappings.containsKey(node.getKey()))
+                if (mappings.containsKey(node.getKey())) {
                     key = mappings.get(node.getKey()).toString();
-                else
+                    key = escape(key);
+                } else {
                     key = node.getKey().toString();
+                    key = escape(key);
+                }
                } else {
                        key = Long.toString(node.getId());
                }
             return key;
         }
+        
+        private String escape(String key) {
+               // Keys may contain  '<' '>' characters, which causes errors in browser SVG handling.
+               return org.apache.commons.lang.StringEscapeUtils.escapeHtml(key);
+        }
+        
+        private String removeElem(String xml, String elemStart) {
+               // FIXME: This is rather nasty and error prone way of removing elements from XML string.
+               // This only supports elements with /> end element tag. Elements ends with </elem name> are not supported!
+               int start = xml.indexOf("<"+elemStart);
+               if (start>=0) {
+                       int end = xml.indexOf(">",start);
+                       if (end >= 0) {
+                               if (start > 0)
+                                       return xml.substring(0,start)+xml.substring(end+1);
+                               else
+                                       return xml.substring(end+1);
+                       }
+               }
+               return null;
+        }
 
         @Override
         public void enter(IG2DNode node) {
@@ -785,9 +908,9 @@ public class SCLScenegraph {
                 String key = getKey((ConnectionNode) node);
                 parentBuilder.append(MAIN_SECTION, "\n<g class=\"connection\" id=\"" + key + "\">");
                 parentBuilder.append(SELECTION_SECTION, "\n<g style=\"visibility:hidden\" class=\"selection\" id=\"" + key + "\">");
-                parentBuilder.append(SELECTION_MASK_SECTION, "\n<g class=\"selectionMask\" opacity=\"0.001\" id=\"" + key + "\">");
+                parentBuilder.append(SELECTION_MASK_SECTION, "\n<g class=\"selectionMask\" opacity=\"" + OPACITY + "\" id=\"" + key + "\">");
                 
-                Element doc = renderSVGNode((IG2DNode)node);
+                Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
                 String svg = printSVGDocument(doc);
                 parentBuilder.append(MAIN_SECTION, svg);
 
@@ -795,7 +918,7 @@ public class SCLScenegraph {
                     n.setIgnoreSelection(false);
                 }
 
-                doc = renderSVGNode((IG2DNode)node);
+                doc = renderSVGNode(svgGenerator, (IG2DNode)node);
                 svg = printSVGDocument(doc);
                 parentBuilder.append(SELECTION_SECTION, svg);
 
@@ -805,15 +928,14 @@ public class SCLScenegraph {
                     n.setDynamicStroke(bs);
                 }
 
-                doc = renderSVGNode((IG2DNode)node);
+                doc = renderSVGNode(svgGenerator, (IG2DNode)node);
                 svg = printSVGDocument(doc);
                 parentBuilder.append(SELECTION_MASK_SECTION, svg);
 
-                parentBuilder.append(SELECTION_MASK_SECTION, "\n</g>");
-                parentBuilder.append(SELECTION_SECTION, "\n</g>");
-                parentBuilder.append(MAIN_SECTION, "\n</g>");
+                senBuilders.put((ConnectionNode)node, new RenderSVGContext());
                 
-            } else if (node instanceof SelectionNode) {
+                
+            } else if (isSelection0(node)) {
                 
                 SelectionNode n = (SelectionNode)node;
                 SingleElementNode parentSEN = (SingleElementNode)NodeUtil.getNearestParentOfType(node, SingleElementNode.class);
@@ -823,17 +945,17 @@ public class SCLScenegraph {
                     
                     String key = getKey(parentSEN);
                     n.setIgnore(false);
-                    Element doc = renderSVGNode((IG2DNode)node);
+                    Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
                     n.setIgnore(true);
                     String svg = printSVGDocument(doc);
                     parentBuilder2.append(SELECTION_SECTION, "\n<g style=\"visibility:hidden\" class=\"selection\" id=\"" + key + "\">");
                     parentBuilder2.append(SELECTION_SECTION, svg);
                     parentBuilder2.append(SELECTION_SECTION, "\n</g>");
-                    parentBuilder2.append(SELECTION_MASK_SECTION, "\n<g class=\"selectionMask\" id=\"" + key + "\">");
+                    parentBuilder2.append(SELECTION_MASK_SECTION, "\n<g class=\"selectionMask\" id=\"" + key /*+ "\" transform=\"" + matrixString + "\"*/+ "\">");
                     Rectangle2D rect = n.getRect();
                     // NaN
                     if(rect.getHeight() == rect.getHeight() && rect.getWidth() == rect.getWidth()) {
-                           parentBuilder2.append(SELECTION_MASK_SECTION,"<rect style=\"fill:#fff\" opacity=\"0.001\"");
+                           parentBuilder2.append(SELECTION_MASK_SECTION,"<rect style=\"fill:#fff\" opacity=\"" + OPACITY + "\"");
                            parentBuilder2.append(SELECTION_MASK_SECTION," x=\"" + rect.getX() + "\" y=\"" + rect.getY() + "\"");
                            parentBuilder2.append(SELECTION_MASK_SECTION," width=\"" + rect.getWidth() + "\" height=\"" + rect.getHeight() + "\"");
                            parentBuilder2.append(SELECTION_MASK_SECTION,"></rect>");
@@ -841,9 +963,46 @@ public class SCLScenegraph {
                     parentBuilder2.append(SELECTION_MASK_SECTION,"\n</g>");
                    
                 }
+            } else if (node instanceof SelectionNode) {
+
+                Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
+                String svg = printSVGDocument(doc);
+                parentBuilder.append(MAIN_SECTION, "<g>");
+                parentBuilder.append(MAIN_SECTION, svg);
+                parentBuilder.append(MAIN_SECTION, "\n</g>");
+
             } else if (node instanceof SVGNode) {
                 SVGNode svg = (SVGNode)node;
-                parentBuilder.append(MAIN_SECTION, svg.getSVGText());
+                AffineTransform at = svg.getTransform();
+                if (!at.isIdentity()) {
+                        if(at.getScaleX() == 1.0 && at.getScaleY() == 1.0 && at.getShearX() == 0.0 && at.getShearY() == 0.0) {
+                         String m = "translate(" + at.getTranslateX() + " " + at.getTranslateY() + ")";
+                         parentBuilder.append(MAIN_SECTION, "\n<g transform=\"" + m + "\">");
+                     } else {
+                         double[] ds = new double[6];
+                         at.getMatrix(ds);
+                         String m = "matrix(" + ds[0] + " " + ds[1] + " " + ds[2] + " " + ds[3] + " " + ds[4] + " " + ds[5] + ")";
+                         parentBuilder.append(MAIN_SECTION, "\n<g transform=\"" + m + "\">");
+                     }
+                }
+                String svgContent = svg.getSVGText();
+                // SVGNode content may contain SVG/XML elements, which break browser compatibility
+                int start = svgContent.indexOf("<svg");
+                if (start >= 0)
+                       svgContent = svgContent.substring(start);
+                else  {
+                       String s = removeElem(svgContent, "?xml");
+                       if (s != null) {
+                               svgContent = "<g>"+s+"</g>";
+                               s = removeElem(svgContent, "!DOCTYPE");
+                               if (s != null)
+                                       svgContent = s;
+                       }
+                }
+                parentBuilder.append(MAIN_SECTION, svgContent);
+                if (!at.isIdentity()) {
+                       parentBuilder.append(MAIN_SECTION, "\n</g>");
+                }
             } else if (node instanceof G2DParentNode) {
                 AffineTransform at = node.getTransform();
                 if(node instanceof SingleElementNode) {
@@ -868,12 +1027,101 @@ public class SCLScenegraph {
                         parentBuilder.append(ALL_SECTIONS, "\n<g transform=\"" + m + "\">");
                     }
                 }
+            } else if (node instanceof TextNode) {
+                TextNode text = (TextNode)node;
+                               
+                 SingleElementNode parentSEN = (SingleElementNode)NodeUtil.getNearestParentOfType(node, SingleElementNode.class);
+                 if(parentSEN != null) {
+                        
+                        text.setShowSelection(false);
+                        Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
+                     String svg = printSVGDocument(doc);
+                     parentBuilder.append(MAIN_SECTION, svg);
+                     
+                        RenderSVGContext parentBuilder2 = getParentBuilder(parentSEN);
+                     
+                     String key = getKey(parentSEN);
+                     text.setShowSelection(true);
+                     doc = renderSVGNode(svgGenerator, (IG2DNode)node);
+                     svg = printSVGDocument(doc);
+                     
+                     parentBuilder2.append(SELECTION_SECTION, "\n<g style=\"visibility:hidden\" class=\"selection\" id=\"" + key + "\">");
+                     parentBuilder2.append(SELECTION_SECTION, svg);
+                     parentBuilder2.append(SELECTION_SECTION, "\n</g>");
+                     parentBuilder2.append(SELECTION_MASK_SECTION, "\n<g class=\"selectionMask\" id=\"" + key /*+ "\" transform=\"" + matrixString + "\"*/+ "\">");
+                     Rectangle2D rect = text.getBounds();
+                     // NaN
+                     if(rect.getHeight() == rect.getHeight() && rect.getWidth() == rect.getWidth()) {
+                           parentBuilder2.append(SELECTION_MASK_SECTION,"<rect style=\"fill:#fff\" opacity=\"" + OPACITY + "\"");
+                           parentBuilder2.append(SELECTION_MASK_SECTION," x=\"" + rect.getX() + "\" y=\"" + rect.getY() + "\"");
+                           parentBuilder2.append(SELECTION_MASK_SECTION," width=\"" + rect.getWidth() + "\" height=\"" + rect.getHeight() + "\"");
+                           parentBuilder2.append(SELECTION_MASK_SECTION,"></rect>");
+                     }
+                     parentBuilder2.append(SELECTION_MASK_SECTION,"\n</g>");
+                    
+                 }
+            } else if (!(node instanceof RouteGraphNode) && !(node instanceof LinkNode)){
+               try {
+                       Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
+                       NodeList gList = doc.getElementsByTagName("g");
+                       if (gList.getLength() == 0)
+                               return;
+                       boolean hasContent = false;
+                       for (int i = 0; i < gList.getLength(); i++) {
+                           Node gNode = gList.item(i);
+                           if (gNode.hasChildNodes()) {
+                               hasContent = true;
+                               break;
+                           }
+                       }
+                       if (!hasContent)
+                           return;
+                       String svg = printSVGDocument(doc);
+                       if (node instanceof SelectionShapeNode) {
+                               SingleElementNode parentSEN = (SingleElementNode)NodeUtil.getNearestParentOfType(node, SingleElementNode.class);
+                        if(parentSEN != null) {
+                                String key = getKey(parentSEN);
+                                RenderSVGContext parentBuilder2 = getParentBuilder(parentSEN);
+                                parentBuilder2.append(SELECTION_SECTION, "\n<g style=\"visibility:hidden\" class=\"selection\" id=\"" + key + "\">");
+                             parentBuilder2.append(SELECTION_SECTION, svg);
+                             parentBuilder2.append(SELECTION_SECTION, "\n</g>");
+                             
+                             parentBuilder2.append(SELECTION_MASK_SECTION, "\n<g class=\"selectionMask\" id=\"" + key /*+ "\" transform=\"" + matrixString + "\"*/+ "\">");
+                             Rectangle2D rect = node.getBounds();
+                             // NaN
+                             if(rect.getHeight() == rect.getHeight() && rect.getWidth() == rect.getWidth()) {
+                                   parentBuilder2.append(SELECTION_MASK_SECTION,"<rect style=\"fill:#fff\" opacity=\"" + OPACITY + "\"");
+                                   parentBuilder2.append(SELECTION_MASK_SECTION," x=\"" + rect.getX() + "\" y=\"" + rect.getY() + "\"");
+                                   parentBuilder2.append(SELECTION_MASK_SECTION," width=\"" + rect.getWidth() + "\" height=\"" + rect.getHeight() + "\"");
+                                   parentBuilder2.append(SELECTION_MASK_SECTION,"></rect>");
+                             }
+                             parentBuilder2.append(SELECTION_MASK_SECTION,"\n</g>");
+                        }
+                       } else {
+                               parentBuilder.append(MAIN_SECTION, "<g class=\"" +node.getSimpleClassName() +"\">");
+                               parentBuilder.append(MAIN_SECTION, svg);
+                               parentBuilder.append(MAIN_SECTION, "\n</g>");
+                       }
+               } catch (Exception e) {
+                       // TODO: There are nodes that do not behave well when rendered to SVG. For backwards compatibility, we don't handle the exceptions.
+               }
             }
 
             //enters.put(node, b.length());
 
         }
         
+        private boolean isSelection0(IG2DNode node) {
+            
+            if(node instanceof SelectionNode) {
+                SelectionNode sn = (SelectionNode)node;
+                return sn.getSelectionId() == 0;
+            } else {
+                return false;
+            }
+            
+        }
+        
         private RenderSVGContext getParentBuilder(IG2DNode node) {
             
             INode parentSEN = NodeUtil.getNearestParentOfType(node, SingleElementNode.class);
@@ -889,8 +1137,32 @@ public class SCLScenegraph {
         @Override
         public void leave(IG2DNode node) {
 
-            if(node instanceof ConnectionNode || node instanceof SVGNode) {
+            if( node instanceof SVGNode) {
                 // We are done
+            } else if (node instanceof ConnectionNode) {
+               RenderSVGContext parentBuilder = getParentBuilder(node);
+               SingleElementNode sen = (SingleElementNode)node;
+               RenderSVGContext b = senBuilders.get(sen);
+               String content = b.get(MAIN_SECTION);
+               if(content.isEmpty()) {
+//                     Handling connection the same way as SingleElementNode would draw connection twice..
+//                     if(sen.getKey() != null) {
+//
+//                             for(SelectionNode n : NodeUtil.collectNodes(node, SelectionNode.class)) {
+//                                     n.setIgnore(true);
+//                             }
+//
+//                             Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
+//                             String svg = printSVGDocument(doc);
+//                             parentBuilder.append(MAIN_SECTION, svg);
+//                     }
+               } else {
+                       parentBuilder.append(b);
+               }
+               parentBuilder.append(SELECTION_MASK_SECTION, "\n</g>");
+                parentBuilder.append(SELECTION_SECTION, "\n</g>");
+                parentBuilder.append(MAIN_SECTION, "\n</g>");
+                
             } else if (node instanceof G2DParentNode) {
                 
                RenderSVGContext parentBuilder = getParentBuilder(node);
@@ -900,12 +1172,16 @@ public class SCLScenegraph {
                        RenderSVGContext b = senBuilders.get(sen);
                        String content = b.get(MAIN_SECTION);
                        if(content.isEmpty()) {
-                               for(SelectionNode n : NodeUtil.collectNodes(node, SelectionNode.class)) {
-                                       n.setIgnore(true);
+                               if(sen.getKey() != null) {
+
+                                       for(SelectionNode n : NodeUtil.collectNodes(node, SelectionNode.class)) {
+                                               n.setIgnore(true);
+                                       }
+
+                                       Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
+                                       String svg = printSVGDocument(doc);
+                                       parentBuilder.append(MAIN_SECTION, svg);
                                }
-                               Element doc = renderSVGNode((IG2DNode)node);
-                               String svg = printSVGDocument(doc);
-                               parentBuilder.append(MAIN_SECTION, svg);
                        } else {
                                parentBuilder.append(b);
                        }