X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FSCLScenegraph.java;h=cc4489f8230812b15badd4287bae73582c47421d;hb=dca20c7c10ae30a7ea50a22e15a043dc8d71af1b;hp=82115ef0e0825e2c9b8b2c69793f6bffd015344b;hpb=934ad9eafe19a1ac87f449b7d27f3ea1e5f53df5;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 82115ef0e..cc4489f82 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,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; @@ -46,6 +48,7 @@ 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; @@ -399,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; @@ -412,9 +431,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 @@ -514,7 +538,7 @@ public class SCLScenegraph { } 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))); + return renderSVG0(width, height, SWT.LEFT, SWT.TOP, ctx, p0 -> p0.stream().collect(Collectors.toMap(p1 -> p1, p2 -> p2))); } /** @@ -536,12 +560,26 @@ public class SCLScenegraph { */ private static final Function1, 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 renderSVG0(width, height, ctx, mapper); + return renderSVG(ctx,width,height, SWT.LEFT, SWT.TOP); } public static String renderSVG(ICanvasContext ctx) { - return renderSVG(ctx, -1, -1); + return renderSVG(ctx, -1, -1, SWT.LEFT, SWT.TOP); } public static String renderSVGMapIdentifiers(ICanvasContext ctx) { @@ -556,7 +594,7 @@ public class SCLScenegraph { * @return */ public static String renderSVGMapIdentifiers(ICanvasContext ctx, double width, double height) { - return renderSVG0(width, height, ctx, new Function1, Map>() { + return renderSVG0(width, height, SWT.LEFT, SWT.TOP, ctx, new Function1, Map>() { @Override public Map apply(Set p0) { @@ -640,7 +678,9 @@ public class SCLScenegraph { } - private static String renderSVG0(double width, double height, ICanvasContext ctx, Function1, Map> mappingFunction) { + + + private static String renderSVG0(double width, double height, int ax, int ay, ICanvasContext ctx, Function1, Map> mappingFunction) { // Get a DOMImplementation. DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation(); @@ -650,7 +690,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(); @@ -661,8 +707,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(); @@ -676,6 +721,10 @@ public class SCLScenegraph { // get the bounds of the content 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) @@ -686,7 +735,29 @@ public class SCLScenegraph { AffineTransform tr = new AffineTransform(); tr.translate(offset, offset); tr.scale(scale, scale); - tr.translate(-content.getX(), -content.getY()); + 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 { @@ -723,7 +794,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)); @@ -784,15 +859,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) { @@ -833,9 +932,8 @@ public class SCLScenegraph { svg = printSVGDocument(doc); parentBuilder.append(SELECTION_MASK_SECTION, svg); - parentBuilder.append(SELECTION_MASK_SECTION, "\n"); - parentBuilder.append(SELECTION_SECTION, "\n"); - parentBuilder.append(MAIN_SECTION, "\n"); + senBuilders.put((ConnectionNode)node, new RenderSVGContext()); + } else if (isSelection0(node)) { @@ -887,7 +985,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"); } @@ -1025,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"); + parentBuilder.append(SELECTION_SECTION, "\n"); + parentBuilder.append(MAIN_SECTION, "\n"); + } else if (node instanceof G2DParentNode) { RenderSVGContext parentBuilder = getParentBuilder(node);