X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FSCLScenegraph.java;h=c8fd242a2f7a1d61adf99ae4629de350e1159c48;hb=0ba7fe0bd44607e9016a131cd94bdd24e48f5823;hp=db65b4de38c33193a1c1fe7e9492c799ab4544e2;hpb=c8d0257f989f7269666d65ddb1510b234b8adf5f;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java index db65b4de3..c8fd242a2 100644 --- a/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java +++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java @@ -31,6 +31,7 @@ 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.simantics.Simantics; import org.simantics.datatypes.literal.GUID; import org.simantics.db.ReadGraph; @@ -46,11 +47,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; @@ -398,6 +401,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; @@ -411,9 +430,14 @@ public class SCLScenegraph { } 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 @@ -639,6 +663,8 @@ public class SCLScenegraph { } + + private static String renderSVG0(double width, double height, ICanvasContext ctx, Function1, Map> mappingFunction) { // Get a DOMImplementation. @@ -649,7 +675,13 @@ 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(); @@ -660,8 +692,7 @@ public class SCLScenegraph { 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(); @@ -722,7 +753,11 @@ public class SCLScenegraph { result.append(ALL_SECTIONS, ""); StringBuilder res = new StringBuilder(); - res.append(""); + if (width > 0 && height > 0 ) { + res.append(""); + } else { + res.append(""); + } res.append(""); res.append(result.get(MAIN_SECTION)); res.append(result.get(SELECTION_SECTION)); @@ -783,15 +818,39 @@ public class SCLScenegraph { 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 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) { @@ -886,7 +945,21 @@ public class SCLScenegraph { parentBuilder.append(MAIN_SECTION, "\n"); } } - parentBuilder.append(MAIN_SECTION, svg.getSVGText()); + String svgContent = svg.getSVGText(); + // SVGNode content may contain SVG/XML elements, which break browser compatibility + int start = svgContent.indexOf("= 0) + svgContent = svgContent.substring(start); + else { + String s = removeElem(svgContent, "?xml"); + if (s != null) { + svgContent = ""+s+""; + s = removeElem(svgContent, "!DOCTYPE"); + if (s != null) + svgContent = s; + } + } + parentBuilder.append(MAIN_SECTION, svgContent); if (!at.isIdentity()) { parentBuilder.append(MAIN_SECTION, "\n"); } @@ -964,9 +1037,31 @@ public class SCLScenegraph { if (!hasContent) return; String svg = printSVGDocument(doc); - parentBuilder.append(MAIN_SECTION, ""); - parentBuilder.append(MAIN_SECTION, svg); - parentBuilder.append(MAIN_SECTION, "\n"); + 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"); + parentBuilder2.append(SELECTION_SECTION, svg); + parentBuilder2.append(SELECTION_SECTION, "\n"); + + parentBuilder2.append(SELECTION_MASK_SECTION, "\n"); + Rectangle2D rect = node.getBounds(); + // NaN + if(rect.getHeight() == rect.getHeight() && rect.getWidth() == rect.getWidth()) { + parentBuilder2.append(SELECTION_MASK_SECTION,""); + } + parentBuilder2.append(SELECTION_MASK_SECTION,"\n"); + } + } else { + parentBuilder.append(MAIN_SECTION, ""); + parentBuilder.append(MAIN_SECTION, svg); + parentBuilder.append(MAIN_SECTION, "\n"); + } } 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. }