X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FDistrictDiagramViewer.java;h=0b0965aca92e75d65f2c4546c30a3445bb53c54f;hb=34ba99ecdb35c06c6769b43dca81c88b45f20295;hp=198389551768a250b22c6be34a293f6f99ba2acb;hpb=ff5441dd6a85ef6fb92c6b3b0cf709bbce878e5e;p=simantics%2Fdistrict.git diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java index 19838955..0b0965ac 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java @@ -9,6 +9,9 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Supplier; +import org.eclipse.e4.core.contexts.IEclipseContext; +import org.eclipse.e4.core.services.events.IEventBroker; +import org.eclipse.ui.PlatformUI; import org.simantics.datatypes.literal.RGB; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; @@ -23,6 +26,7 @@ import org.simantics.district.network.ui.internal.Activator; import org.simantics.district.network.ui.nodes.DistrictRenderingPreparationNode; import org.simantics.district.network.ui.nodes.DistrictSelectionNode; import org.simantics.district.network.ui.participants.DNPointerInteractor; +import org.simantics.district.network.ui.participants.DistrictFinderVisualisationParticipant; import org.simantics.district.network.ui.participants.DynamicVisualisationContributionsParticipant; import org.simantics.district.network.ui.participants.MapRulerPainter; import org.simantics.district.network.visualisations.DynamicVisualisations; @@ -32,6 +36,7 @@ import org.simantics.district.network.visualisations.model.DynamicSizeContributi import org.simantics.district.network.visualisations.model.SizeBarOptions; import org.simantics.g2d.canvas.ICanvasContext; import org.simantics.g2d.canvas.impl.CanvasContext; +import org.simantics.g2d.diagram.DiagramHints; import org.simantics.g2d.diagram.handler.PickRequest.PickFilter; import org.simantics.g2d.diagram.participant.DelayedBatchElementPainter; import org.simantics.g2d.diagram.participant.ElementPainter; @@ -82,8 +87,19 @@ public class DistrictDiagramViewer extends DiagramViewer { DistrictRenderingPreparationNode prepNode = new DistrictRenderingPreparationNode(); prepNode.setZIndex(Integer.MIN_VALUE / 2); spatialRoot.addNode("districtRenderingPrepareNode", prepNode); + + + IEclipseContext workbenchContext = getWorkbenchContext(); + IEventBroker eventBroker = workbenchContext.get(IEventBroker.class); + DistrictFinderVisualisationParticipant districtFinderVisualisationParticipant = new DistrictFinderVisualisationParticipant(eventBroker); + ctx.add(districtFinderVisualisationParticipant); + } - + + public static IEclipseContext getWorkbenchContext(){ + return PlatformUI.getWorkbench().getService(IEclipseContext.class); + } + protected String getPopupId() { return "#DistrictDiagramPopup"; } @@ -101,6 +117,7 @@ public class DistrictDiagramViewer extends DiagramViewer { h.setHint(PanZoomRotateHandler.KEY_ZOOM_IN_LIMIT, 10000.0); h.setHint(PanZoomRotateHandler.KEY_ZOOM_OUT_LIMIT, 0.01); h.setHint(DiagramModelHints.KEY_DIAGRAM_RESOURCE, diagramResource); + h.removeHint(DiagramHints.SNAP_ADVISOR); } @Override