X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fnodes%2FDistrictNetworkEdgeNode.java;h=8f8c08e6cc36f7f838e86c2254217f1fff1179fa;hb=6f8ba9e7f5c9d07c11f495d2f88f17dae4d6705f;hp=00a1427f5f2e6d07f72c6770364f94892afb64c1;hpb=8364294edf86a6915ae3fe7eade555d95fd7e435;p=simantics%2Fdistrict.git diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java index 00a1427f..8f8c08e6 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java @@ -12,10 +12,12 @@ import java.awt.geom.Rectangle2D; import org.simantics.district.network.ModelledCRS; import org.simantics.district.network.ui.DistrictNetworkEdge; +import org.simantics.district.network.ui.adapters.DistrictNetworkEdgeElementFactory; import org.simantics.scenegraph.INode; import org.simantics.scenegraph.ISelectionPainterNode; import org.simantics.scenegraph.g2d.G2DNode; import org.simantics.scenegraph.g2d.G2DParentNode; +import org.simantics.scenegraph.g2d.G2DRenderingHints; import org.simantics.scenegraph.g2d.nodes.SVGNode; import org.simantics.scenegraph.utils.GeometryUtils; import org.simantics.scenegraph.utils.NodeUtil; @@ -29,9 +31,9 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection private DistrictNetworkEdge edge; private Rectangle2D bounds; - private transient Line2D path; + private transient Path2D path; - private boolean scaleStroke = true; + private static boolean scaleStroke = true; private Color color; private Double stroke; private transient Color dynamicColor = null; @@ -43,11 +45,20 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection private static final double height = 0.5; private static final Rectangle2D NORMAL = new Rectangle2D.Double(left, top, width, height); - + private transient Point2D centerPoint; private transient Rectangle2D symbolRect; private transient AffineTransform symbolTransform; + + private boolean hidden = false; + private Double arrowLength; + + private static double startX; + private static double startY; + private static double endX; + private static double endY; + @Override public void init() { } @@ -56,95 +67,162 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection public void render(Graphics2D g2d) { AffineTransform ot = null; AffineTransform t = getTransform(); + double scale = scaleStroke ? (Double) g2d.getRenderingHint(DistrictRenderingHints.KEY_VIEW_SCALE_UNDER_SPATIAL_ROOT) : 1.0; if (t != null && !t.isIdentity()) { - ot = g2d.getTransform(); - g2d.transform(getTransform()); - } - - Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - - Color oldColor = g2d.getColor(); - BasicStroke oldStroke = (BasicStroke) g2d.getStroke(); - - BasicStroke bs = null; - if (scaleStroke) { - double scale = GeometryUtils.getScale(g2d.getTransform()); - scale = Math.max(10000, Math.min(scale, 50000)); - double str = stroke != null ? Math.abs(stroke) : 1.0; - bs = GeometryUtils.scaleStroke(STROKE, (float) (str / scale)); - } else { - bs = STROKE; + //ot = g2d.getTransform(); + ot = (AffineTransform) g2d.getRenderingHint(G2DRenderingHints.KEY_TRANSFORM_UNDER_SPATIAL_ROOT); + if (ot == null) + ot = g2d.getTransform(); + g2d.transform(t); + if (scaleStroke) { + AffineTransform work = DistrictNetworkNodeUtils.sharedTransform.get(); + work.setTransform(ot); + work.concatenate(t); + scale = DistrictNetworkNodeUtils.getScale(work); + } } - path = calculateLine(edge, path); - - if (isSelected()) { - g2d.setColor(SELECTION_COLOR); - g2d.setStroke(GeometryUtils.scaleStroke(bs, 4f)); + if (!hidden) { + Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING); + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + + Color oldColor = g2d.getColor(); + BasicStroke oldStroke = (BasicStroke) g2d.getStroke(); + + BasicStroke bs = null; + if (scaleStroke) { + bs = GeometryUtils.scaleStroke(STROKE, getStrokeWidth(scale)); + } else { + bs = STROKE; + } + + int zoomLevel = (Integer) g2d.getRenderingHint(DistrictRenderingHints.KEY_VIEW_ZOOM_LEVEL); + path = calculatePath(edge, path, zoomLevel > 13); + + if (isSelected()) { + g2d.setColor(SELECTION_COLOR); + g2d.setStroke(GeometryUtils.scaleAndOffsetStrokeWidth(bs, 1.f, (float)(2 * STROKE.getLineWidth() / scale))); + g2d.draw(path); + } + + g2d.setColor(dynamicColor != null ? dynamicColor : color); + g2d.setStroke(bs); g2d.draw(path); + + // Draw arrow + if (arrowLength != null) { + g2d.setColor(Color.BLACK); + float lw = STROKE.getLineWidth() / (float)scale; + g2d.setStroke(new BasicStroke(lw, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL)); + + double l = arrowLength; + double w = 2 * (double) lw * Math.signum(l); + if (Math.abs(w) > Math.abs(l)) w = l; + double offset = 2 * (double) lw; + + double centerX = (startX + endX) / 2, centerY = (startY + endY) / 2; + double deltaX = endX - startX, deltaY = endY - startY; + double length = Math.sqrt(deltaX * deltaX + deltaY * deltaY); + deltaX /= length; + deltaY /= length; + + double x0 = centerX - l/2 * deltaX + offset * deltaY; + double y0 = centerY - l/2 * deltaY - offset * deltaX; + double x1 = centerX + (l/2 - w) * deltaX + offset * deltaY; + double y1 = centerY + (l/2 - w) * deltaY - offset * deltaX; + + g2d.draw(new Line2D.Double(x0, y0, x1, y1)); + + Path2D path = new Path2D.Double(); + path.moveTo(x1 + w * deltaX, y1 + w * deltaY); + path.lineTo(x1 + w * deltaY, y1 - w * deltaX); + path.lineTo(x1 - w * deltaY, y1 + w * deltaX); + path.closePath(); + g2d.fill(path); + } + + // Reset + g2d.setStroke(oldStroke); + g2d.setColor(oldColor); + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint); } - g2d.setColor(dynamicColor != null ? dynamicColor : color); - g2d.setStroke(bs); - g2d.draw(path); - - // Reset - g2d.setStroke(oldStroke); - g2d.setColor(oldColor); - - // Render SVG symbol - double viewScaleRecip = 10; - if (scaleStroke) { - double scale = GeometryUtils.getScale(g2d.getTransform()); - scale = Math.max(10000, Math.min(scale, 50000)); - viewScaleRecip /= scale; - } - - Point2D p = getCenterPoint(); - symbolRect = DistrictNetworkNodeUtils.calculateDrawnGeometry(p, NORMAL, symbolRect, viewScaleRecip); - symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(symbolRect, symbolTransform); - for (INode nn : getNodes()) { G2DNode g2dNode = (G2DNode)nn; - g2dNode.setTransform(symbolTransform); + if (g2dNode instanceof SVGNode) { + // Render SVG symbol + double viewScaleRecip = 10; + if (scaleStroke) { + viewScaleRecip /= scale; + } + + // If the node is hidden from the start, then the center point cannot be calculated yet. + Point2D p = getCenterPoint(); + if (p == null) + break; + + symbolRect = DistrictNetworkNodeUtils.calculateDrawnGeometry(p, NORMAL, symbolRect, viewScaleRecip); + symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(symbolRect, symbolTransform); + + g2dNode.setTransform(symbolTransform); + } g2dNode.render(g2d); } - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint); if (ot != null) g2d.setTransform(ot); } + public float getStrokeWidth(AffineTransform tr, boolean selection) { + double scale = DistrictNetworkNodeUtils.getScale(tr); + float width = STROKE.getLineWidth() * getStrokeWidth(scale); + if (selection) width = width + (float) (2 * STROKE.getLineWidth() / scale); + return width; + } + + private float getStrokeWidth(double scale) { + if (scaleStroke) { + double str = stroke != null ? Math.abs(stroke) : 1.0; + float strokeWidth = (float) (str / scale); + return strokeWidth; + } + else { + return 1.f; + } + } + + public Path2D getPath() { + return path; + } + private Point2D getCenterPoint() { + if (path == null) + return null; if (centerPoint == null) centerPoint = new Point2D.Double(); - Rectangle2D bounds = path.getBounds2D(); centerPoint.setLocation(bounds.getCenterX(), bounds.getCenterY()); return centerPoint; } - public static Line2D calculateLine(DistrictNetworkEdge edge, Line2D result) { - // Convert to screen coordinates - double startX = ModelledCRS.longitudeToX(edge.getStartPoint().getX()); - double startY = ModelledCRS.latitudeToY(-edge.getStartPoint().getY()); // Invert for Simantics - double endX = ModelledCRS.longitudeToX(edge.getEndPoint().getX()); - double endY = ModelledCRS.latitudeToY(-edge.getEndPoint().getY());// Invert for Simantics - - if (result == null) - result = new Line2D.Double(); - result.setLine(startX, startY, endX, endY); - return result; - } - - public static Path2D calculatePath(DistrictNetworkEdge edge, Path2D result) { - // Convert to screen coordinates - double startX = ModelledCRS.longitudeToX(edge.getStartPoint().getX()); - double startY = ModelledCRS.latitudeToY(-edge.getStartPoint().getY()); // Invert for Simantics - double endX = ModelledCRS.longitudeToX(edge.getEndPoint().getX()); - double endY = ModelledCRS.latitudeToY(-edge.getEndPoint().getY());// Invert for Simantics +// public static Line2D calculateLine(DistrictNetworkEdge edge, Line2D result) { +// // Convert to screen coordinates +// double startX = ModelledCRS.longitudeToX(edge.getStartPoint().getX()); +// double startY = ModelledCRS.latitudeToY(-edge.getStartPoint().getY()); // Invert for Simantics +// double endX = ModelledCRS.longitudeToX(edge.getEndPoint().getX()); +// double endY = ModelledCRS.latitudeToY(-edge.getEndPoint().getY());// Invert for Simantics +// +// if (result == null) +// result = new Line2D.Double(); +// result.setLine(startX, startY, endX, endY); +// return result; +// } + + public static Path2D calculatePath(DistrictNetworkEdge edge, Path2D result, boolean detailed) { + startX = ModelledCRS.longitudeToX(edge.getStartPoint().getX()); + startY = ModelledCRS.latitudeToY(-edge.getStartPoint().getY()); + endX = ModelledCRS.longitudeToX(edge.getEndPoint().getX()); + endY = ModelledCRS.latitudeToY(-edge.getEndPoint().getY()); if (result == null) { result = new Path2D.Double(); @@ -152,6 +230,18 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection result.reset(); } result.moveTo(startX, startY); + if (detailed) { + double[] detailedGeometry = edge.getGeometry(); + if (detailedGeometry != null && !DistrictNetworkEdgeElementFactory.EMPTY.equals(detailedGeometry)) { + // ok, lets do this + + for (int i = 0; i < detailedGeometry.length; i += 2) { + double x = ModelledCRS.longitudeToX(detailedGeometry[i]); + double y = ModelledCRS.latitudeToY(-detailedGeometry[i+1]);// Invert for Simantics + result.lineTo(x, y); + } + } + } result.lineTo(endX, endY); return result; } @@ -173,7 +263,7 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection } private Rectangle2D calculateBounds(Rectangle2D rect) { - return calculatePath(edge, null).getBounds2D(); + return calculatePath(edge, null, false).getBounds2D(); } public void setDNEdge(DistrictNetworkEdge edge) { @@ -198,6 +288,11 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection public void setDynamicColor(Color color) { this.dynamicColor = color; } + + @PropertySetter(value = "arrowLength") + public void setArrowLength(Double length) { + arrowLength = length; + } @PropertySetter(value = "SVG") public void setSVG(String value) { @@ -206,4 +301,9 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection ((SVGNode)nn).setData(value); } + + @PropertySetter(value = "hidden") + public void setHidden(Boolean value) { + this.hidden = value; + } }