X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fadapters%2FDistrictNetworkEdgeElement.java;h=20c86d8ddec6dbc4e83a88a5a630805bb8474e8f;hb=386525ce8e466427df0624a304ebb64df249d1bb;hp=a7cd09ac63a522d3dfb6d740f9d67652fa527248;hpb=02ecca5e61d2eb17de40cc058be678b414aaad00;p=simantics%2Fdistrict.git diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java index a7cd09ac..20c86d8d 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java @@ -1,24 +1,37 @@ package org.simantics.district.network.ui.adapters; import java.awt.Color; +import java.awt.Shape; import java.awt.geom.AffineTransform; +import java.awt.geom.Line2D; +import java.awt.geom.Path2D; +import java.awt.geom.PathIterator; +import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.util.Collection; import java.util.Collections; +import org.simantics.district.network.ModelledCRS; import org.simantics.district.network.ui.DistrictNetworkEdge; import org.simantics.district.network.ui.nodes.DistrictNetworkEdgeNode; import org.simantics.g2d.connection.handler.ConnectionHandler; +import org.simantics.g2d.diagram.handler.PickRequest.PickPolicy; import org.simantics.g2d.diagram.handler.Topology.Connection; import org.simantics.g2d.element.ElementClass; import org.simantics.g2d.element.ElementUtils; import org.simantics.g2d.element.IElement; import org.simantics.g2d.element.SceneGraphNodeKey; import org.simantics.g2d.element.handler.InternalSize; +import org.simantics.g2d.element.handler.Outline; +import org.simantics.g2d.element.handler.Pick; import org.simantics.g2d.element.handler.SceneGraph; +import org.simantics.g2d.element.handler.impl.ConnectionSelectionOutline; import org.simantics.g2d.element.handler.impl.DefaultTransform; import org.simantics.g2d.element.handler.impl.SimpleElementLayers; +import org.simantics.maps.MapScalingTransform; import org.simantics.scenegraph.g2d.G2DParentNode; +import org.simantics.scenegraph.g2d.nodes.SVGNode; +import org.simantics.scenegraph.utils.NodeUtil; import org.simantics.utils.datastructures.hints.IHintContext.Key; import org.simantics.utils.datastructures.hints.IHintContext.KeyOf; import org.slf4j.Logger; @@ -28,7 +41,8 @@ public class DistrictNetworkEdgeElement { public static final Key KEY_DN_EDGE = new KeyOf(DistrictNetworkEdge.class, "DN_EDGE"); public static final Key KEY_DN_EDGE_NODE = new SceneGraphNodeKey(DistrictNetworkEdgeNode.class, "DN_EDGE_NODE"); - + public static final Key KEY_DN_EDGE_SYMBOL_NODE = new SceneGraphNodeKey(DistrictNetworkEdgeNode.class, "DN_EDGE_SYMBOL_NODE"); + public static final ElementClass CLASS = ElementClass.compile( DefaultTransform.INSTANCE, @@ -36,14 +50,16 @@ public class DistrictNetworkEdgeElement { DNEdgeSceneGraph.INSTANCE, DNEdgeConnectionHandler.INSTANCE, SimpleElementLayers.INSTANCE, + // TODO: do we need this and does it work? + ConnectionSelectionOutline.INSTANCE, DistrictNetworkAdditionalColor.INSTANCE ).setId(DistrictNetworkEdgeElement.class.getSimpleName()); - + static final class DNEdgeSceneGraph implements SceneGraph { - + public static final DNEdgeSceneGraph INSTANCE = new DNEdgeSceneGraph(); - private static final long serialVersionUID = 8894367073815556871L; + private static final long serialVersionUID = 68135568495835923L; @Override public void init(IElement edgeElement, G2DParentNode parent) { @@ -55,47 +71,162 @@ public class DistrictNetworkEdgeElement { if (node == null) { node = parent.addNode(ElementUtils.generateNodeId(edgeElement), DistrictNetworkEdgeNode.class); edgeElement.setHint(KEY_DN_EDGE_NODE, node); + + SVGNode symbol = node.addNode(ElementUtils.generateNodeId(edgeElement), SVGNode.class); + edgeElement.setHint(KEY_DN_EDGE_SYMBOL_NODE, symbol); } node.setColor(ElementUtils.getAdditionalColor(edgeElement, Color.BLUE)); node.setDNEdge(edge); + AffineTransform at = ElementUtils.getTransform(edgeElement); + if (at != null) + node.setTransform(at); } } @Override public void cleanup(IElement edge) { + ElementUtils.removePossibleNode(edge, KEY_DN_EDGE_SYMBOL_NODE); ElementUtils.removePossibleNode(edge, KEY_DN_EDGE_NODE); edge.removeHint(KEY_DN_EDGE_NODE); + edge.removeHint(KEY_DN_EDGE_SYMBOL_NODE); } } - - static final class DNEdgeInternalSize implements InternalSize { + + static final class DNEdgeInternalSize implements InternalSize, Outline, Pick { private static final Logger LOGGER = LoggerFactory.getLogger(DNEdgeInternalSize.class); - - private static final long serialVersionUID = -2725017034692179676L; - + + private static final long serialVersionUID = -7346653820911240628L; + public static final DNEdgeInternalSize INSTANCE = new DNEdgeInternalSize(); @Override public Rectangle2D getBounds(IElement e, Rectangle2D size) { - DistrictNetworkEdge edge = e.getHint(KEY_DN_EDGE); + DistrictNetworkEdgeNode edgeNode = e.getHint(KEY_DN_EDGE_NODE); if (size == null) size = new Rectangle2D.Double(); - if (edge != null) - edge.getBounds(size); + if (edgeNode != null) + size.setFrame(edgeNode.getBoundsInLocal()); else LOGGER.debug("Element {} does not have edge!", e); return size; } + + @Override + public Shape getElementShape(IElement e) { + DistrictNetworkEdgeNode edgeNode = e.getHint(KEY_DN_EDGE_NODE); + if (edgeNode != null) { + return edgeNode.getPath(); + } else { + return getBounds(e, null); + } + } + + @Override + public boolean pickTest(IElement e, Shape s, PickPolicy policy) { + DistrictNetworkEdge edge = e.getHint(KEY_DN_EDGE); + if (edge != null) { + Rectangle2D bounds = getBounds(s); + switch (policy) { + case PICK_CONTAINED_OBJECTS: return pickContainedObjects(edge, bounds); + case PICK_INTERSECTING_OBJECTS: return pickIntersectingObjects(e, edge, bounds); + } + return false; + } + + return false; + } + + private boolean pickContainedObjects(DistrictNetworkEdge edge, Rectangle2D bounds) { + double bminx = bounds.getMinX() / MapScalingTransform.getScaleX(); + double bminy = bounds.getMinY() / MapScalingTransform.getScaleY(); + double bmaxx = bounds.getMaxX() / MapScalingTransform.getScaleX(); + double bmaxy = bounds.getMaxY() / MapScalingTransform.getScaleY(); + + double bsminx = ModelledCRS.xToLongitude(bminx); + double bsminy = ModelledCRS.yToLatitude(-bminy); // Invert for Simantics diagram coordinate system + double bsmaxx = ModelledCRS.xToLongitude(bmaxx); + double bsmaxy = ModelledCRS.yToLatitude(-bmaxy); // Invert for Simantics diagram coordinate system + + double boundsMinY = Math.min(bsminy, bsmaxy); + double boundsMaxY = Math.max(bsminy, bsmaxy); + + Point2D start = edge.getStartPoint(); + Point2D end = edge.getEndPoint(); + + double eminx = Math.min(start.getX(), end.getX()); + double eminy = Math.min(start.getY(), end.getY()); + double emaxx = Math.max(start.getX(), end.getX()); + double emaxy = Math.max(start.getY(), end.getY()); + + return eminx >= bsminx && eminy >= boundsMinY && emaxx <= bsmaxx && emaxy <= boundsMaxY; + } + + private boolean pickIntersectingObjects(IElement e, DistrictNetworkEdge edge, Rectangle2D bounds) { + double dx = bounds.getWidth() / MapScalingTransform.getScaleX(); + double dy = bounds.getHeight() / MapScalingTransform.getScaleY(); + + // Half the diagonal + half of the line width + DistrictNetworkEdgeNode node = e.getHint(KEY_DN_EDGE_NODE); + AffineTransform at = NodeUtil.getLocalToGlobalTransform(node); + + Path2D path = node.getPath(); + if (path == null) + return false; + + double lineWidth = node.getStrokeWidth(at, true); + double tolerance = Math.sqrt(dx * dx + dy * dy) / 2 + lineWidth / 2; + + double sx = bounds.getCenterX() / MapScalingTransform.getScaleX(); + double sy = bounds.getCenterY() / MapScalingTransform.getScaleY(); + + double coords[] = new double[6]; + Point2D prevPoint = new Point2D.Double(), curPoint = new Point2D.Double(); + Line2D line = new Line2D.Double(); + for (PathIterator it = path.getPathIterator(null); !it.isDone(); it.next()) { + int type = it.currentSegment(coords); + switch (type) { + case PathIterator.SEG_MOVETO: + curPoint.setLocation(coords[0], coords[1]); + break; + case PathIterator.SEG_LINETO: + prevPoint.setLocation(curPoint); + curPoint.setLocation(coords[0], coords[1]); + line.setLine(prevPoint, curPoint); + double distSq = line.ptSegDistSq(sx, sy); +// System.out.println("s: " + sx + ", " + sy); +// System.out.println("ss: " + ssx + ", " + ssy); +// System.out.println("p1: " + edge.getStartPoint()); +// System.out.println("p2: " + edge.getEndPoint()); +// System.out.println("line: " + "(" + line.getX1() + ", " + line.getY1() + ", " + line.getX2() + ", " + line.getY2() + ")"); +// System.out.println("distance from line is " + Math.sqrt(distSq) + " with tolerance " + tolerance); + if (distSq <= tolerance * tolerance) + return true; + break; + default: + LOGGER.error("Invalid edge path", new IllegalStateException()); + return false; + } + } + + return false; + } + + private Rectangle2D getBounds(Shape shape) { + if (shape instanceof Rectangle2D) + return (Rectangle2D) shape; + return shape.getBounds2D(); + } + } - + static class DNEdgeConnectionHandler implements ConnectionHandler { - private static final long serialVersionUID = -410377314637446238L; - + private static final long serialVersionUID = -6882671891381761687L; + public static final DNEdgeConnectionHandler INSTANCE = new DNEdgeConnectionHandler(); @Override @@ -118,4 +249,5 @@ public class DistrictNetworkEdgeElement { return Collections.emptyList(); } } + }