X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2FSCLScenegraph.java;h=4e4811c5a15fe066d6ecf645accbe8fc26a4ca93;hp=e0c198388e41f20a0f6848c22b2e70ae34b0ea2f;hb=34ee11ce2339ebdae4783e5765583a6ae13c2920;hpb=bf710ef2cae0f2e560b54d988fcf79a724ff50bf 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 e0c198388..4e4811c5a 100644 --- a/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java +++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java @@ -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; @@ -45,6 +46,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.g2d.canvas.Hints; import org.simantics.g2d.canvas.ICanvasContext; import org.simantics.g2d.diagram.DiagramHints; import org.simantics.g2d.diagram.IDiagram; @@ -276,6 +278,23 @@ public class SCLScenegraph { } return "No nodes in scenegraph!"; } + + /** + * Returns background color of a canvasContext or null. + * @param ctx + * @return color in RGBA List format, or null. + */ + public static List getBackgroundColor(ICanvasContext ctx) { + Color color = ctx.getDefaultHintContext().getHint(Hints.KEY_BACKGROUND_COLOR); + if (color == null) + return null; + ArrayList 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) { @@ -378,12 +397,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 @@ -422,20 +443,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 +500,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))); } /** @@ -513,11 +525,19 @@ public class SCLScenegraph { * Default no-op mapper */ private static final Function1, 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 @@ -525,8 +545,8 @@ public class SCLScenegraph { * @param ctx * @return */ - public static String renderSVGMapIdentifiers(ICanvasContext ctx) { - return renderSVG0(ctx, new Function1, Map>() { + public static String renderSVGMapIdentifiers(ICanvasContext ctx, double width, double height) { + return renderSVG0(width, height, ctx, new Function1, Map>() { @Override public Map apply(Set p0) { @@ -610,7 +630,7 @@ public class SCLScenegraph { } - private static String renderSVG0(ICanvasContext ctx, Function1, Map> mappingFunction) { + private static String renderSVG0(double width, double height, ICanvasContext ctx, Function1, Map> mappingFunction) { // Get a DOMImplementation. DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation(); @@ -624,6 +644,7 @@ public class SCLScenegraph { RenderSVGContext result = new RenderSVGContext(); + double[] matrix = new double[6]; try { Selection selection = ctx.getAtMostOneItemOfClass(Selection.class); @@ -642,48 +663,31 @@ 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; + + // 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.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.setSVGCanvasSize(new Dimension((int)Math.ceil(scale * content.getWidth()) + 2*offset, (int)Math.ceil(scale * content.getHeight()) + 2*offset)); + //svgGenerator.setClip(content); result.append(MAIN_SECTION, ""); result.append(SELECTION_SECTION, ""); result.append(SELECTION_MASK_SECTION, ""); - result.append(ALL_SECTIONS, ""); - - KeyVisitor keyVisitor = new KeyVisitor(); sg.accept(keyVisitor); @@ -691,7 +695,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 +704,15 @@ public class SCLScenegraph { } - result.append(ALL_SECTIONS, ""); + result.append(ALL_SECTIONS, ""); StringBuilder res = new StringBuilder(); res.append(""); + res.append(""); res.append(result.get(MAIN_SECTION)); res.append(result.get(SELECTION_SECTION)); res.append(result.get(SELECTION_MASK_SECTION)); + res.append(""); res.append(""); // System.err.println(" == FINAL RESULT == "); @@ -749,12 +755,14 @@ public class SCLScenegraph { HashMap 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) { @@ -787,7 +795,7 @@ public class SCLScenegraph { parentBuilder.append(SELECTION_SECTION, "\n"); parentBuilder.append(SELECTION_MASK_SECTION, "\n"); - Element doc = renderSVGNode((IG2DNode)node); + Element doc = renderSVGNode(svgGenerator, (IG2DNode)node); String svg = printSVGDocument(doc); parentBuilder.append(MAIN_SECTION, svg); @@ -795,7 +803,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,7 +813,7 @@ public class SCLScenegraph { n.setDynamicStroke(bs); } - doc = renderSVGNode((IG2DNode)node); + doc = renderSVGNode(svgGenerator, (IG2DNode)node); svg = printSVGDocument(doc); parentBuilder.append(SELECTION_MASK_SECTION, svg); @@ -823,13 +831,13 @@ 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"); parentBuilder2.append(SELECTION_SECTION, svg); parentBuilder2.append(SELECTION_SECTION, "\n"); - parentBuilder2.append(SELECTION_MASK_SECTION, "\n"); + parentBuilder2.append(SELECTION_MASK_SECTION, "\n"); Rectangle2D rect = n.getRect(); // NaN if(rect.getHeight() == rect.getHeight() && rect.getWidth() == rect.getWidth()) { @@ -843,7 +851,22 @@ public class SCLScenegraph { } } else if (node instanceof SVGNode) { SVGNode svg = (SVGNode)node; + 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"); + } 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"); + } + } parentBuilder.append(MAIN_SECTION, svg.getSVGText()); + if (!at.isIdentity()) { + parentBuilder.append(MAIN_SECTION, "\n"); + } } else if (node instanceof G2DParentNode) { AffineTransform at = node.getTransform(); if(node instanceof SingleElementNode) { @@ -900,12 +923,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); }