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=a4f348eb11e1314b0b07119a7adf235861b453dc;hb=830edf8e15f1608c13a869efe52d61f7da6bd9ae;hp=cd35b2f011329ac926fa0e6d51f8b7a0c5046fe5;hpb=00e4eca98cef6d77d5023f4b424f9e8da0487463;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 cd35b2f0..a4f348eb 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 @@ -4,7 +4,6 @@ import java.awt.BasicStroke; import java.awt.Color; import java.awt.Graphics2D; import java.awt.RenderingHints; -import java.awt.Stroke; import java.awt.geom.AffineTransform; import java.awt.geom.Path2D; import java.awt.geom.Point2D; @@ -12,86 +11,162 @@ 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.maps.MapScalingTransform; +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.nodes.SVGNode; import org.simantics.scenegraph.utils.GeometryUtils; import org.simantics.scenegraph.utils.NodeUtil; -public class DistrictNetworkEdgeNode extends G2DNode { +public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelectionPainterNode { private static final long serialVersionUID = 8049769475036519806L; - - private static final Stroke SELECTION_STROKE = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER); - private static final Color SELECTION_COLOR = new Color(255, 0, 255, 96); - + + private static final BasicStroke STROKE = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND); + private static final Color SELECTION_COLOR = new Color(255, 0, 255, 96); + private DistrictNetworkEdge edge; private Rectangle2D bounds; - - private static final Stroke STROKE = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND); - private boolean scaleStroke = true; + private transient Path2D path; + private boolean scaleStroke = true; private Color color; + private Double stroke; + private transient Color dynamicColor = null; + // Dimensions for shut-off valve symbol + private static final double left = -0.25; + private static final double top = -0.25; + private static final double width = 0.5; + 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; + @Override public void init() { - } - + @Override public void render(Graphics2D g2d) { - AffineTransform ot = null; AffineTransform t = getTransform(); 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(); -// boolean selected = isSelected(); -// if (selected) { -// Path2D selectionPath = edge.getPath(); -// Shape selectionShape = SELECTION_STROKE.createStrokedShape(selectionPath); -// g2d.setColor(SELECTION_COLOR); -// g2d.fill(selectionShape); -// } -// - g2d.setColor(color); - if (STROKE != null) { - if (scaleStroke && STROKE instanceof BasicStroke) { - BasicStroke bs = GeometryUtils.scaleStroke(STROKE, (float) (1.0 / GeometryUtils.getScale(g2d.getTransform()))); - g2d.setStroke(bs); - } else { - g2d.setStroke(STROKE); - } + + 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; } + int zoomLevel = MapScalingTransform.zoomLevel(ot); + path = calculatePath(edge, path, zoomLevel > 15); + + if (isSelected()) { + g2d.setColor(SELECTION_COLOR); + g2d.setStroke(GeometryUtils.scaleStroke(bs, 4f)); + g2d.draw(path); + } + + g2d.setColor(dynamicColor != null ? dynamicColor : color); + g2d.setStroke(bs); + g2d.draw(path); - g2d.draw(calculatePath(edge)); - // Reset g2d.setStroke(oldStroke); g2d.setColor(oldColor); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint); + // 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); + g2dNode.render(g2d); + } + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint); + if (ot != null) g2d.setTransform(ot); } - - public static Path2D calculatePath(DistrictNetworkEdge edge) { + + private Point2D getCenterPoint() { + 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, boolean detailed) { // Convert to screen coordinates double startX = ModelledCRS.longitudeToX(edge.getStartPoint().getX()); - double startY = ModelledCRS.latitudeToY(edge.getStartPoint().getY()); + double startY = ModelledCRS.latitudeToY(-edge.getStartPoint().getY()); // Invert for Simantics double endX = ModelledCRS.longitudeToX(edge.getEndPoint().getX()); - double endY = ModelledCRS.latitudeToY(edge.getEndPoint().getY()); - - // render - Path2D path = new Path2D.Double(); - path.moveTo(startX, startY); - path.lineTo(endX, endY); - return path; + double endY = ModelledCRS.latitudeToY(-edge.getEndPoint().getY());// Invert for Simantics + + if (result == null) { + result = new Path2D.Double(); + } else { + 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; } private boolean isSelected() { @@ -102,7 +177,7 @@ public class DistrictNetworkEdgeNode extends G2DNode { public Rectangle2D getBoundsInLocal() { return bounds; } - + private void updateBounds() { Rectangle2D oldBounds = bounds; if (oldBounds == null) @@ -111,7 +186,7 @@ public class DistrictNetworkEdgeNode extends G2DNode { } private Rectangle2D calculateBounds(Rectangle2D rect) { - return calculatePath(edge).getBounds2D(); + return calculatePath(edge, null, false).getBounds2D(); } public void setDNEdge(DistrictNetworkEdge edge) { @@ -122,9 +197,26 @@ public class DistrictNetworkEdgeNode extends G2DNode { public void setColor(Color color) { this.color = color; } - + public Color getColor() { return color; } + @PropertySetter(value = "stroke") + public void setStroke(Double stroke) { + this.stroke = stroke; + } + + @PropertySetter(value = "dynamicColor") + public void setDynamicColor(Color color) { + this.dynamicColor = color; + } + + @PropertySetter(value = "SVG") + public void setSVG(String value) { + for (INode nn : this.getNodes()) + if (nn instanceof SVGNode) + ((SVGNode)nn).setData(value); + } + }