X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FNetworkDrawingParticipant.java;h=4ff231034935f30c3da0d694cde4debc56198e4e;hb=e6b35994e05232dd536af4da224a342c1bd090af;hp=77ec735f6d2cc14c9f6013127244b6e82fac3ace;hpb=bc05b1b2f95286aea041032325626fec71dc39b7;p=simantics%2Fdistrict.git diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java index 77ec735f..4ff23103 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java @@ -5,16 +5,16 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.simantics.db.Resource; import org.simantics.diagram.ui.DiagramModelHints; import org.simantics.district.network.ui.adapters.DistrictNetworkEdgeElement; import org.simantics.district.network.ui.adapters.DistrictNetworkVertexElement; -import org.simantics.district.network.ui.nodes.DistrictNetworkEdgeNode; import org.simantics.district.network.ui.nodes.DistrictNetworkVertexNode; -import org.simantics.district.network.ui.nodes.HoverSensitiveNode; import org.simantics.district.network.ui.nodes.NetworkDrawingNode; +import org.simantics.district.network.ui.participants.DNPickSorter; import org.simantics.district.network.ui.participants.DynamicVisualisationContributionsParticipant; import org.simantics.g2d.canvas.impl.DependencyReflection.Dependency; import org.simantics.g2d.canvas.impl.SGNodeReflection.SGInit; @@ -24,36 +24,29 @@ import org.simantics.g2d.diagram.handler.PickRequest; import org.simantics.g2d.diagram.participant.AbstractDiagramParticipant; import org.simantics.g2d.element.ElementHints; import org.simantics.g2d.element.IElement; +import org.simantics.maps.MapScalingTransform; +import org.simantics.scenegraph.INode; import org.simantics.scenegraph.Node; import org.simantics.scenegraph.g2d.G2DParentNode; -import org.simantics.scenegraph.g2d.IG2DNode; -import org.simantics.utils.datastructures.hints.IHintContext.Key; -import org.simantics.utils.datastructures.hints.IHintContext.KeyOf; +import org.simantics.scenegraph.utils.GeometryUtils; public class NetworkDrawingParticipant extends AbstractDiagramParticipant { public static final String NETWORK_DRAWING_NODE = "networkDrawingNode"; - @Dependency + @Dependency PickContext pick; - - /** - * A hint key for terminal pick distance in control pixels. - * @see #PICK_DIST - */ - public static final Key KEY_PICK_DISTANCE = new KeyOf(Double.class, "PICK_DISTANCE"); - /** - * Default terminal pick distance in control pixels. - * @see #DEFAULT_PICK_DISTANCE - */ - public static final double PICK_DIST = 10; - private NetworkDrawingNode node; - private DynamicVisualisationContributionsParticipant dynamicVisualisationContributionsParticipant; private AffineTransform transform; - + + /** + * Holds the current element for which hover information is shown. + * This exists only to optimize the hover updating procedure. + */ + private IElement currentHoverElement; + public NetworkDrawingParticipant(DynamicVisualisationContributionsParticipant dynamicVisualisationContributionsParticipant, AffineTransform transform) { this.dynamicVisualisationContributionsParticipant = dynamicVisualisationContributionsParticipant; this.transform = transform; @@ -65,77 +58,53 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant { node.setTransform(transform); node.setNetworkDrawingParticipant(this); } - + @Override protected void onDiagramSet(IDiagram newDiagram, IDiagram oldDiagram) { node.setDiagram(newDiagram); } - public boolean pickHoveredElement(Point2D currentMousePos, boolean isConnectionTool) { - PickRequest req = new PickRequest(new Rectangle2D.Double(currentMousePos.getX(), currentMousePos.getY(), 1e-8, 1e-8)).context(getContext()); + public boolean pickHoveredElement(Point2D canvasPos, boolean isConnectionTool, AffineTransform viewTransform) { + PickRequest req = new PickRequest(getPickRect(canvasPos, viewTransform)).context(getContext()); List pickables = new ArrayList<>(); pick.pick(diagram, req, pickables); - List snap = diagram.getSnapshot(); + Collections.sort(pickables, DNPickSorter.nearestVerticesFirst(false, DNPickSorter.centerDistSq(canvasPos.getX(), canvasPos.getY()))); - hoverNodes2(pickables, true, isConnectionTool, currentMousePos); - // we repaint ourselves once the async calulation is ready + updateHoveredElement(pickables, true, isConnectionTool, viewTransform); + // Will repaint once the async hover info calculation is ready, no need to do it here return false; - -// boolean changed = false; -// changed |= hoverNodes(snap, false, isConnectionTool, currentMousePos); -// changed |= hoverNodes(pickables, true, isConnectionTool, currentMousePos); - //return changed; } - private boolean hoverNodes2(List elements, boolean hover, boolean isConnectionTool, Point2D p) { + private boolean updateHoveredElement(List elements, boolean hover, boolean isConnectionTool, AffineTransform viewTransform) { if (elements == null || elements.isEmpty()) { + currentHoverElement = null; return dynamicVisualisationContributionsParticipant.doHover(false, isConnectionTool); } else { - boolean changed = dynamicVisualisationContributionsParticipant.doHover(true, isConnectionTool); - if (changed) { - // we prefer the first picked element only - IElement elem = elements.get(0); - G2DParentNode node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE); - if (node instanceof DistrictNetworkVertexNode) { - } else { - node = elem.getHint(DistrictNetworkEdgeElement.KEY_DN_EDGE_NODE); - } - Resource mapElement = elem.getHint(ElementHints.KEY_OBJECT); - Resource runtimeDiagram = diagram.getHint(DiagramModelHints.KEY_DIAGRAM_RUNTIME_RESOURCE); - dynamicVisualisationContributionsParticipant.hoverNode(runtimeDiagram, mapElement, node); - } - return changed; - } - } + dynamicVisualisationContributionsParticipant.doHover(true, isConnectionTool); - private boolean hoverNodes(List elements, boolean hover, boolean isConnectionTool, Point2D p) { - boolean changed = false; - for (IElement elem : elements) { - Node node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE); - if (node instanceof DistrictNetworkVertexNode) { - changed |= ((DistrictNetworkVertexNode) node).hover(hover, isConnectionTool); - if (hover) - ((DistrictNetworkVertexNode) node).setMousePosition(p); - } else { + // we prefer the first picked element only + IElement elem = elements.get(0); + if (elem.equals(currentHoverElement)) + return false; + + INode node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE); + if (node == null) node = elem.getHint(DistrictNetworkEdgeElement.KEY_DN_EDGE_NODE); - if (node instanceof DistrictNetworkEdgeNode) { - for (IG2DNode n : ((DistrictNetworkEdgeNode) node).getNodes()) { - if (n instanceof HoverSensitiveNode) { - changed |= ((HoverSensitiveNode)n).hover(hover, isConnectionTool); - if (hover) - ((HoverSensitiveNode)n).setMousePosition(p); - } - } - } - } + if (node == null) + return false; + + Resource mapElement = elem.getHint(ElementHints.KEY_OBJECT); + Resource runtimeDiagram = diagram.getHint(DiagramModelHints.KEY_DIAGRAM_RUNTIME_RESOURCE); + currentHoverElement = elem; + dynamicVisualisationContributionsParticipant.hoverNode(runtimeDiagram, mapElement, node, MapScalingTransform.zoomLevel(viewTransform)); + return true; } - return changed; } - public boolean isHoveringOverNode(Point2D currentMousePos) { - PickRequest req = new PickRequest(currentMousePos).context(getContext()); - List pickables = new ArrayList(); + public boolean isHoveringOverNode(Point2D canvasPos, AffineTransform viewTransform) { + PickRequest req = new PickRequest(getPickRect(canvasPos, viewTransform)).context(getContext()); + List pickables = new ArrayList<>(); pick.pick(diagram, req, pickables); for (IElement elem : pickables) { Node node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE); @@ -146,7 +115,20 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant { return false; } + private Rectangle2D getPickRect(Point2D canvasPos, AffineTransform viewTransform) { + double pixelScale = 1.0 / GeometryUtils.getScale(viewTransform); + if (Double.isInfinite(pixelScale)) + pixelScale = 1e-8; + + Rectangle2D pickRect = GeometryUtils.expandRectangle( + new Rectangle2D.Double(canvasPos.getX(), canvasPos.getY(), 0, 0), + pixelScale * 4); + + return pickRect; + } + public AffineTransform getTransform() { return transform; } + }