]> gerrit.simantics Code Review - simantics/platform.git/blobdiff - bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java
Handle SelectionOutline interface implementation in SCLScenegraph
[simantics/platform.git] / bundles / org.simantics.modeling / src / org / simantics / modeling / SCLScenegraph.java
index bfab7fc6c0f7f8472a4c4158f547a0cf6acce68e..82115ef0e0825e2c9b8b2c69793f6bffd015344b 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;
@@ -18,6 +19,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import javax.xml.transform.OutputKeys;
@@ -30,19 +32,26 @@ import org.apache.batik.dom.GenericDOMImplementation;
 import org.apache.batik.svggen.SVGGeneratorContext;
 import org.apache.batik.svggen.SVGGraphics2D;
 import org.simantics.Simantics;
+import org.simantics.datatypes.literal.GUID;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.common.request.IndexRoot;
+import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.common.request.UnaryRead;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.exception.RuntimeDatabaseException;
+import org.simantics.db.layer0.variable.Variables;
+import org.simantics.diagram.elements.DecorationSVGNode;
 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.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;
@@ -60,7 +69,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.DecorationSVGNode;
+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;
@@ -69,6 +78,7 @@ import org.simantics.scenegraph.g2d.nodes.connection.RouteGraphNode;
 import org.simantics.scenegraph.g2d.nodes.spatial.RTreeNode;
 import org.simantics.scenegraph.utils.NodeUtil;
 import org.simantics.scl.runtime.function.Function1;
+import org.simantics.scl.runtime.tuple.Tuple2;
 import org.simantics.trend.impl.ItemNode;
 import org.simantics.utils.threads.ThreadUtils;
 import org.slf4j.Logger;
@@ -76,21 +86,67 @@ 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 {
 
        private static final Logger LOGGER = LoggerFactory.getLogger(SCLScenegraph.class);
+       
+       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);
                return provider;
        }
        
+       @Deprecated
        public static void disposeSceneGraphProvider(ICanvasSceneGraphProvider provider) {
                provider.dispose();
        }
-       
+
+    public static <T> T doWithICanvasSceneGraphProvider(Resource diagram, Function1<ICanvasSceneGraphProvider, T> func) throws DatabaseException {
+        return doWithICanvasSceneGraphProvider(diagram, (Function<ICanvasSceneGraphProvider, T>) provider -> func.apply(provider));
+    }
+
+    public static <T> T doWithICanvasSceneGraphProvider(Resource diagram, Function<ICanvasSceneGraphProvider, T> func) throws DatabaseException {
+        Tuple2 result = Simantics.getSession().syncRequest(new ResourceRead<Tuple2>(diagram) {
+
+            @Override
+            public Tuple2 perform(ReadGraph graph) throws DatabaseException {
+                Resource indexRoot = graph.syncRequest(new IndexRoot(resource));
+                String diagramRVI = Variables.getRVI(graph, resource);
+                return new Tuple2(indexRoot, diagramRVI);
+            }
+        });
+        ICanvasSceneGraphProvider provider = DiagramNodeUtil.loadSceneGraphProvider((Resource) result.c0, diagram, (String) result.c1);
+        try {
+            return func.apply(provider);
+        } finally {
+            provider.dispose();
+        }
+    }
+
+    public static <T> T doWithCanvasContext(Resource diagram, Function1<ICanvasContext, T> func) throws DatabaseException {
+        return doWithCanvasContext(diagram, (Function<ICanvasContext, T>) canvasContext -> func.apply(canvasContext));
+    }
+
+    public static <T> T doWithCanvasContext(Resource diagram, Function<ICanvasContext, T> func) throws DatabaseException {
+        return doWithICanvasSceneGraphProvider(diagram, (Function<ICanvasSceneGraphProvider, T>) provider -> func.apply(provider.getCanvasContext()));
+    }
+
        public static String getNodeTransform(ICanvasContext ctx, String name) {
                
                Set<TextNode> texts = NodeUtil.collectNodes(ctx.getSceneGraph(), TextNode.class);
@@ -232,6 +288,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) {
        
@@ -334,12 +407,14 @@ 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) {
                        super(document);
+                       // prevent batik comment in each g-element
+                       getGeneratorContext().setComment(null);
                }
 
                @Override
@@ -378,20 +453,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 {
 
@@ -448,7 +510,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, ctx, p0 -> p0.stream().collect(Collectors.toMap(p1 -> p1, p2 -> p2)));
        }
 
     /**
@@ -469,11 +535,19 @@ public class SCLScenegraph {
      * Default no-op mapper
      */
     private static final Function1<Set<?>, Map<?, ?>> mapper = p0 -> p0.stream().collect(Collectors.toMap(p1 -> p1, p2 -> p2));
-    
+
+    public static String renderSVG(ICanvasContext ctx, double width, double height) {
+        return renderSVG0(width, height, ctx, mapper);
+    }
+
     public static String renderSVG(ICanvasContext ctx) {
-        return renderSVG0(ctx, mapper);
+       return renderSVG(ctx, -1, -1);
     }
 
+    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
@@ -481,8 +555,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, ctx, new Function1<Set<?>, Map<?, ?>>() {
 
             @Override
             public Map<?, ?> apply(Set<?> p0) {
@@ -498,29 +572,27 @@ public class SCLScenegraph {
                                 try {
                                     if (p instanceof Resource) {
                                         Resource element = (Resource) p;
-                                        if (graph.isInstanceOf(element, DIA.Connection) || graph.isInstanceOf(element, DIA.Terminal)) {
-                                            // Ok, lets create a hashcode for connections and terminals as they do not have identifiers 
-                                            return graph.getURI(element).hashCode();
-                                        } else if (graph.isInstanceOf(element, DIA.Element)) {
+                                        if (graph.isInstanceOf(element, DIA.Element)) {
                                             Resource component = graph.getPossibleObject(element, MOD.ElementToComponent);
                                             if (component != null) {
-                                                Object relatedValue = graph.getPossibleRelatedValue(component, L0.identifier);
-                                                if (relatedValue != null) {
-                                                    if (relatedValue instanceof Object[]) {
-                                                        // OK, found guid, lets generate new based on URI
-                                                        return Arrays.toString(createURIBasedL0Identifier(graph, component));
-                                                    } else {
-                                                        System.err.println("Component " + component + " identifeir is not normal: " + relatedValue);
-                                                    }
+                                                GUID identifier = graph.getPossibleRelatedValue(component, L0.identifier, GUID.BINDING);
+                                                if (identifier != null) {
+                                                    return Arrays.toString(createURIBasedL0Identifier(graph, component));
                                                 } else {
-                                                    System.err.println("Compoennt " + component + " dooes not have identifier");
+                                                    LOGGER.error("Component {} does not have GUID identifier!", component);
                                                 }
+                                            } else if (graph.isInstanceOf(element, DIA.Connection) || graph.isInstanceOf(element, DIA.Terminal)) {
+                                                // Ok, lets create a hashcode for connections and terminals as they do not have identifiers 
+                                                return graph.getURI(element).hashCode();
                                             } else {
-                                                System.err.println("Element " + element + " does not have component");
+                                                // Ok, lets create a hashcode or either return empty string in cases where no ID is required
+                                                if (graph.hasStatement(element, L0.HasName))
+                                                    return graph.getURI(element).hashCode();
+                                                return "";
                                             }
                                         }
                                     } else {
-                                        System.err.println("p is not resource but is " + p);
+                                        LOGGER.error("Parameter p {} is not resource but it is {}", p, p.getClass());
                                     }
                                     return p;
                                 } catch (DatabaseException e) {
@@ -537,7 +609,38 @@ public class SCLScenegraph {
         });
        }
        
-       private static String renderSVG0(ICanvasContext ctx, Function1<Set<?>, Map<?, ?>> mappingFunction) {
+    static class RenderSVGContext {
+       
+       Map<String,StringBuilder> documents = new HashMap<>();
+       
+       public void append(String[] keys, String svgText) {
+               for(String key : keys) append(key, svgText);
+       }
+
+       public void append(String key, String svgText) {
+               StringBuilder builder = documents.get(key);
+               if(builder == null) {
+                       builder = new StringBuilder();
+                       documents.put(key, builder);
+               }
+               builder.append(svgText);
+       }
+       
+       public void append(RenderSVGContext other) {
+               for(String key : other.documents.keySet()) {
+                       append(key, other.get(key));
+               }
+       }
+       
+       public String get(String key) {
+               StringBuilder builder = documents.get(key);
+               if(builder == null) return "";
+               else return builder.toString();
+       }
+       
+    }
+    
+       private static String renderSVG0(double width, double height, ICanvasContext ctx, Function1<Set<?>, Map<?, ?>> mappingFunction) {
 
                // Get a DOMImplementation.
                DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation();
@@ -549,8 +652,9 @@ public class SCLScenegraph {
                // Create an instance of the SVG Generator.
                SVGGraphics2D svgGenerator = new Generator(document);
 
-               StringBuilder result = new StringBuilder();
+               RenderSVGContext result = new RenderSVGContext();
 
+               double[] matrix = new double[6];
                try {
 
             Selection selection = ctx.getAtMostOneItemOfClass(Selection.class);
@@ -562,40 +666,43 @@ public class SCLScenegraph {
             }
 
                        G2DSceneGraph sg = ctx.getSceneGraph();
+                       sg.performCleanup();
                        G2DParentNode root = (G2DParentNode) sg.getRootNode();
 
                        // rtree is the actual content of the diagram
                        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;
+                       
+                       
+                       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);
+                           tr.translate(-content.getX(), -content.getY());
+                           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;
+                       //svgGenerator.translate(-content.getX(), -content.getY());
 
-                       // Set svgCanvasSize to the given size parameters
-                       svgGenerator.setSVGCanvasSize(new Dimension((int)(scale * content.getWidth()), (int)(scale * content.getHeight())));
-                       svgGenerator.setClip(content);
-
-                       double trX = -1 * content.getX();
-                       double trY = -1 * content.getY();
-
-                       result.append("<svg width=\"100%\" height=\"100%\" stroke=\"black\"><g transform=\"translate(").append(trX).append(' ').append(trY).append(")\">");
+                       
+                       //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\">");
 
                        KeyVisitor keyVisitor = new KeyVisitor();
                        sg.accept(keyVisitor);
@@ -604,17 +711,31 @@ public class SCLScenegraph {
                        
                        Map<?, ?> mappings = mappingFunction.apply(keys);
 
-                       IG2DNodeVisitor visitor = new PrintingVisitor(result, mappings);
+                       IG2DNodeVisitor visitor = new PrintingVisitor(svgGenerator, result, mappings);
+                       
                        sg.accept(visitor);
 
                } catch (Throwable t) {
                        LOGGER.error("Problems rendering canvas context to SVG", t);
                }
 
-               result.append("</g></svg>");
-               //System.err.println(" == FINAL RESULT == ");
-               //System.err.println(b);
-               return result.toString();
+
+               result.append(ALL_SECTIONS, "</g>");
+
+               StringBuilder res = new StringBuilder();
+               res.append("<svg width=\"100%\" height=\"100%\" stroke=\"black\">");
+               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 == ");
+//             System.err.println(res.toString());
+               
+               return res.toString();
+               
        }
        
        
@@ -647,30 +768,36 @@ public class SCLScenegraph {
 
         int indent = 0;
 
-        HashMap<SingleElementNode,StringBuilder> senBuilders = new HashMap<>();
+        HashMap<SingleElementNode,RenderSVGContext> senBuilders = new HashMap<>();
 
-        private StringBuilder result;
+        private RenderSVGContext result;
+        private SVGGraphics2D svgGenerator;
 
         private Map<?, ?> mappings;
 
-        public PrintingVisitor(StringBuilder 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 (mappings.containsKey(node.getKey()))
-                key = mappings.get(node.getKey()).toString();
-            else
-                key = node.getKey().toString();
+               if(node.getKey() != null) {
+                if (mappings.containsKey(node.getKey()))
+                    key = mappings.get(node.getKey()).toString();
+                else
+                    key = node.getKey().toString();
+               } else {
+                       key = Long.toString(node.getId());
+               }
             return key;
         }
 
         @Override
         public void enter(IG2DNode node) {
             
-            StringBuilder parentBuilder = getParentBuilder(node);
+               RenderSVGContext parentBuilder = getParentBuilder(node);
             
             indent++;
             if(node instanceof ConnectionNode) {
@@ -680,93 +807,215 @@ public class SCLScenegraph {
                 }
 
                 String key = getKey((ConnectionNode) node);
-                parentBuilder.append("\n<g class=\"connection\" id=\"" + key + "\">");
-                Element doc = renderSVGNode((IG2DNode)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=\"" + OPACITY + "\" id=\"" + key + "\">");
+                
+                Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
                 String svg = printSVGDocument(doc);
-                parentBuilder.append(svg);
+                parentBuilder.append(MAIN_SECTION, svg);
 
                 for(RouteGraphNode n : NodeUtil.collectNodes(node, RouteGraphNode.class)) {
                     n.setIgnoreSelection(false);
                 }
 
-                parentBuilder.append("\n<g style=\"visibility:hidden\" class=\"selection\" id=\"" + key + "\">");
-                doc = renderSVGNode((IG2DNode)node);
+                doc = renderSVGNode(svgGenerator, (IG2DNode)node);
                 svg = printSVGDocument(doc);
-                parentBuilder.append(svg);
-                parentBuilder.append("\n</g>");
+                parentBuilder.append(SELECTION_SECTION, svg);
 
-                BasicStroke bs = new BasicStroke(5f);
+                BasicStroke bs = new BasicStroke(10f);
                 
                 for(RouteGraphNode n : NodeUtil.collectNodes(node, RouteGraphNode.class)) {
                     n.setDynamicStroke(bs);
                 }
 
-                parentBuilder.append("\n<g class=\"selectionMask\" opacity=\"0.001\" id=\"" + key + "\">");
-                doc = renderSVGNode((IG2DNode)node);
+                doc = renderSVGNode(svgGenerator, (IG2DNode)node);
                 svg = printSVGDocument(doc);
-                parentBuilder.append(svg);
-                parentBuilder.append("\n</g>");
+                parentBuilder.append(SELECTION_MASK_SECTION, svg);
 
-                parentBuilder.append("\n</g>");
+                parentBuilder.append(SELECTION_MASK_SECTION, "\n</g>");
+                parentBuilder.append(SELECTION_SECTION, "\n</g>");
+                parentBuilder.append(MAIN_SECTION, "\n</g>");
                 
-            } else if (node instanceof SelectionNode) {
+            } else if (isSelection0(node)) {
                 
                 SelectionNode n = (SelectionNode)node;
                 SingleElementNode parentSEN = (SingleElementNode)NodeUtil.getNearestParentOfType(node, SingleElementNode.class);
-                if(parentSEN != null && parentSEN.getKey() != null) {
+                if(parentSEN != null) {
                     
-                    StringBuilder parentBuilder2 = getParentBuilder(parentSEN);
+                       RenderSVGContext parentBuilder2 = getParentBuilder(parentSEN);
                     
                     String key = getKey(parentSEN);
-                    Element doc = renderSVGNode((IG2DNode)node);
+                    n.setIgnore(false);
+                    Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
+                    n.setIgnore(true);
                     String svg = printSVGDocument(doc);
-                    parentBuilder2.append("\n<g style=\"visibility:hidden\" class=\"selection\" id=\"" + key + "\">");
-                    parentBuilder2.append(svg);
-                    parentBuilder2.append("\n</g>");
-                    parentBuilder2.append("\n<g class=\"selectionMask\" id=\"" + key + "\">");
+                    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 = n.getRect();
-                    parentBuilder2.append("<rect style=\"fill:#fff\" opacity=\"0.001\"");
-                    parentBuilder2.append(" x=\"" + rect.getX() + "\" y=\"" + rect.getY() + "\"");
-                    parentBuilder2.append(" width=\"" + rect.getWidth() + "\" height=\"" + rect.getHeight() + "\"");
-                    parentBuilder2.append("></rect>");
-                    parentBuilder2.append("\n</g>");
+                    // 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 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(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 + "\">");
+                     }
+                }
+                parentBuilder.append(MAIN_SECTION, svg.getSVGText());
+                if (!at.isIdentity()) {
+                       parentBuilder.append(MAIN_SECTION, "\n</g>");
+                }
             } else if (node instanceof G2DParentNode) {
                 AffineTransform at = node.getTransform();
                 if(node instanceof SingleElementNode) {
                     SingleElementNode sen = (SingleElementNode)node;
-                    if(sen.getKey() != null) {
-                        String key = getKey(sen);
-                        parentBuilder.append("\n<g class=\"definedElement\" id=\"" + key + "\">");
-                    }
-                    senBuilders.put(sen, new StringBuilder());
+                    String key = getKey(sen);
+                    String typeClass = sen.getTypeClass();
+                    String clazz = "definedElement";
+                    if(typeClass != null && !typeClass.isEmpty())
+                       clazz = clazz + " " + typeClass;
+
+                    parentBuilder.append(MAIN_SECTION, "\n<g class=\""+clazz+"\" id=\"" + key + "\">");
+                    senBuilders.put(sen, new RenderSVGContext());
                 }
                 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("\n<g transform=\"" + m + "\">");
+                        parentBuilder.append(ALL_SECTIONS, "\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("\n<g transform=\"" + m + "\">");
+                        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 StringBuilder getParentBuilder(IG2DNode node) {
+        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);
             if(parentSEN instanceof G2DSceneGraph) return result;
 
-            StringBuilder parentBuilder = senBuilders.get(parentSEN);
+            RenderSVGContext parentBuilder = senBuilders.get(parentSEN);
             if(parentBuilder == null) return result;
             
             return parentBuilder;
@@ -780,40 +1029,37 @@ public class SCLScenegraph {
                 // We are done
             } else if (node instanceof G2DParentNode) {
                 
-                StringBuilder parentBuilder = getParentBuilder(node);
+               RenderSVGContext parentBuilder = getParentBuilder(node);
                 
                 if(node instanceof SingleElementNode) {
-                    SingleElementNode sen = (SingleElementNode)node;
-//                  if(sen.getKey() != null) {
-                        StringBuilder b = senBuilders.get(sen);
-                        String content = b.toString();
-                        if(content.isEmpty()) {
-                            if(sen.getKey() != null) {
-                                
-                                for(SelectionNode n : NodeUtil.collectNodes(node, SelectionNode.class)) {
-                                    n.setIgnore(true);
-                                }
-
-                                Element doc = renderSVGNode((IG2DNode)node);
-                                String svg = printSVGDocument(doc);
-                                parentBuilder.append(svg);
-                            }
-                        } else {
-                            parentBuilder.append(content);
-                        }
-//                  }
+                       SingleElementNode sen = (SingleElementNode)node;
+                       RenderSVGContext b = senBuilders.get(sen);
+                       String content = b.get(MAIN_SECTION);
+                       if(content.isEmpty()) {
+                               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);
+                       }
                 }
-
                 
                 AffineTransform at = node.getTransform();
                 if(!at.isIdentity()) {
-                    parentBuilder.append("</g>");
+                    parentBuilder.append(ALL_SECTIONS, "</g>");
                 }
                 if(node instanceof SingleElementNode) {
                     SingleElementNode sen = (SingleElementNode)node;
-                    if(sen.getKey() != null) {
-                        parentBuilder.append("</g>");
-                    }
+                    //if(sen.getKey() != null) {
+                        parentBuilder.append(MAIN_SECTION, "</g>");
+                    //}
                 }
             }
             indent --;