From 34ecf6b4160c61e33a4de2a66bee227e5adae4db Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Wed, 26 Sep 2018 08:24:14 +0300 Subject: [PATCH] Made spatial picking optimization optional for now R-tree -based element picking doesn't work for DnD monitors at the moment, needs more work. gitlab #66 Change-Id: Ia30243aa48fdd75d238e71422ec0aec358e46af9 (cherry picked from commit 659b89ec3b47e57753db44217990499ebf0b2486) --- .../diagram/handler/impl/PickContextImpl.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/handler/impl/PickContextImpl.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/handler/impl/PickContextImpl.java index a891d62b7..f6fd5fe6d 100644 --- a/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/handler/impl/PickContextImpl.java +++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/handler/impl/PickContextImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Association for Decentralized Information Management + * Copyright (c) 2007, 2018 Association for Decentralized Information Management * in Industry THTH ry. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,6 +8,7 @@ * * Contributors: * VTT Technical Research Centre of Finland - initial API and implementation + * Semantum Oy - gitlab #66 - parallel/spatial optimization *******************************************************************************/ package org.simantics.g2d.diagram.handler.impl; @@ -51,6 +52,8 @@ import org.slf4j.LoggerFactory; /** * @author Toni Kalajainen + * @author Jani Simomaa + * @author Tuukka Lehtonen */ public class PickContextImpl implements PickContext { @@ -62,6 +65,16 @@ public class PickContextImpl implements PickContext { private static final ThreadLocal perThreadElementBounds = ThreadLocal.withInitial(() -> new Rectangle2D.Double()); + private boolean useRTree; + + public PickContextImpl() { + this(false); + } + + public PickContextImpl(boolean useRTree) { + this.useRTree = useRTree; + } + @Override public void pick( IDiagram diagram, @@ -171,11 +184,11 @@ public class PickContextImpl implements PickContext { return shape.getBounds2D(); } - private static List pickElements(IDiagram diagram, PickRequest request) { + private List pickElements(IDiagram diagram, PickRequest request) { ILayers layers = diagram.getHint(DiagramHints.KEY_LAYERS); // Get the scene graph nodes that intersect the pick-requests pick shape - INode spatialRoot = request.pickContext != null + INode spatialRoot = useRTree && request.pickContext != null ? request.pickContext.getSceneGraph().lookupNode(SceneGraphConstants.SPATIAL_ROOT_NODE_ID) : null; -- 2.47.1