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=cc5b24e1652e69427b1c6a34a919f6e869cbc044;hb=dab24824da1b284b8a4734a069cfba72fb1f05de;hp=68b7aa791407b2efdfa68a2065a919baf4490fef;hpb=7851902c16663a27134ec1c8f72e3206b4d47dad;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 68b7aa79..cc5b24e1 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 @@ -2,6 +2,7 @@ package org.simantics.district.network.ui; import java.awt.Color; import java.awt.geom.AffineTransform; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Supplier; @@ -15,8 +16,13 @@ import org.simantics.db.procedure.Listener; import org.simantics.diagram.ui.DiagramModelHints; import org.simantics.district.network.DistrictNetworkUtil; import org.simantics.district.network.ui.participants.DNPointerInteractor; +import org.simantics.district.network.ui.participants.DynamicVisualisationContributionsParticipant; import org.simantics.district.network.ui.participants.ElevationServerParticipant; import org.simantics.district.network.ui.participants.MapRulerPainter; +import org.simantics.district.network.visualisations.model.ColorBarOptions; +import org.simantics.district.network.visualisations.model.DynamicColorContribution; +import org.simantics.district.network.visualisations.model.DynamicSizeContribution; +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.handler.PickRequest.PickFilter; @@ -34,9 +40,12 @@ import org.simantics.maps.MapScalingTransform; import org.simantics.maps.eclipse.MapPainter; import org.simantics.maps.sg.commands.MapCommands; import org.simantics.modeling.ui.diagramEditor.DiagramViewer; +import org.simantics.scenegraph.g2d.events.command.Command; import org.simantics.scenegraph.g2d.events.command.CommandEvent; import org.simantics.scenegraph.g2d.events.command.Commands; import org.simantics.utils.datastructures.hints.IHintContext; +import org.simantics.utils.datastructures.hints.IHintContext.Key; +import org.simantics.utils.datastructures.hints.IHintContext.KeyOf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,6 +66,7 @@ public class DistrictDiagramViewer extends DiagramViewer { ctx.add(new NetworkDrawingParticipant(tr)); ctx.add(new ElevationServerParticipant(tr)); + ctx.add(new DynamicVisualisationContributionsParticipant(tr)); } protected String getPopupId() { @@ -105,6 +115,10 @@ public class DistrictDiagramViewer extends DiagramViewer { // super.loadPageSettings() does async-db-operations setupDrawMapEnabled(); setupBackgroundColor(); + setupColoringObjects(); + setupColorBarOptions(); + setupSizingObjects(); + setupSizeBarOptions(); } private void setupDrawMapEnabled() { @@ -118,7 +132,7 @@ public class DistrictDiagramViewer extends DiagramViewer { result -> queueBackgroundColorChangeEvent(result), () -> DistrictDiagramViewer.this.isDisposed())); } - + private void queueBackgroundColorChangeEvent(RGB.Integer result) { if (result != null) { Color backgroundColor = new Color(result.red, result.green, result.blue); @@ -127,6 +141,72 @@ public class DistrictDiagramViewer extends DiagramViewer { } } + private void setupColoringObjects() { + sessionContext.getSession().asyncRequest(new ColoringObjectsRequest(getInputResource()), new ColoringObjectsListener( + result -> queueColoringObjectsChangeEvent(result), + () -> DistrictDiagramViewer.this.isDisposed())); + } + + + private void setupColorBarOptions() { + sessionContext.getSession().asyncRequest(new ColorBarOptionsRequest(getInputResource()), new ColorBarOptionsListener( + result -> queueColorBarOptionsChangeEvent(result), + () -> DistrictDiagramViewer.this.isDisposed())); + } + + private void setupSizingObjects() { + sessionContext.getSession().asyncRequest(new SizingObjectsRequest(getInputResource()), new SizingObjectsListener( + result -> queueSizingObjectsChangeEvent(result), + () -> DistrictDiagramViewer.this.isDisposed())); + } + + + private void setupSizeBarOptions() { + sessionContext.getSession().asyncRequest(new SizeBarOptionsRequest(getInputResource()), new SizeBarOptionsListener( + result -> queueSizeBarOptionsChangeEvent(result), + () -> DistrictDiagramViewer.this.isDisposed())); + } + + public static final Key KEY_MAP_COLOR_BAR_OPTIONS = new KeyOf(ColorBarOptions.class, "colorBarOptions"); + public static final Command MAP_COLOR_BAR_OPTIONS_CHANGE = new Command("colorBarOptionsChange"); + public static final Key KEY_MAP_SIZE_BAR_OPTIONS = new KeyOf(SizeBarOptions.class, "sizeBarOptions"); + public static final Command MAP_SIZE_BAR_OPTIONS_CHANGE = new Command("sizeBarOptionsChange"); + + public static final Key KEY_MAP_COLORING_OBJECTS = new KeyOf(Map.class, "coloringObjects"); + public static final Command MAP_COLORING_OBJECTS_CHANGE = new Command("coloringObjectsChange"); + + public static final Key KEY_MAP_SIZING_OBJECTS = new KeyOf(Map.class, "sizingObjects"); + public static final Command MAP_SIZING_OBJECTS_CHANGE = new Command("sizingObjectsChange"); + + + private void queueColoringObjectsChangeEvent(Map result) { + if (result != null) { + canvasContext.getDefaultHintContext().setHint(KEY_MAP_COLORING_OBJECTS, result); + canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_COLORING_OBJECTS_CHANGE)); + } + } + + private void queueColorBarOptionsChangeEvent(ColorBarOptions result) { + if (result != null) { + canvasContext.getDefaultHintContext().setHint(KEY_MAP_COLOR_BAR_OPTIONS, result); + canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_COLOR_BAR_OPTIONS_CHANGE)); + } + } + + private void queueSizingObjectsChangeEvent(Map result) { + if (result != null) { + canvasContext.getDefaultHintContext().setHint(KEY_MAP_SIZING_OBJECTS, result); + canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_SIZING_OBJECTS_CHANGE)); + } + } + + private void queueSizeBarOptionsChangeEvent(SizeBarOptions result) { + if (result != null) { + canvasContext.getDefaultHintContext().setHint(KEY_MAP_SIZE_BAR_OPTIONS, result); + canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_SIZE_BAR_OPTIONS_CHANGE)); + } + } + private static class DrawMapEnabledRequest extends UnaryRead { public DrawMapEnabledRequest(Resource diagram) { @@ -206,4 +286,164 @@ public class DistrictDiagramViewer extends DiagramViewer { return isDisposed.get(); } } + + private static class ColorBarOptionsRequest extends UnaryRead { + + public ColorBarOptionsRequest(Resource diagram) { + super(diagram); + } + + @Override + public ColorBarOptions perform(ReadGraph graph) throws DatabaseException { + return DistrictNetworkUtil.colorBarOptions(graph, parameter); + } + } + + private static class ColoringObjectsRequest extends UnaryRead> { + + public ColoringObjectsRequest(Resource diagram) { + super(diagram); + } + + @Override + public Map perform(ReadGraph graph) throws DatabaseException { + return DistrictNetworkUtil.colorContributions(graph, parameter); + } + } + + private static class ColoringObjectsListener implements Listener> { + + private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class); + + private Consumer> callback; + private Supplier isDisposed; + + public ColoringObjectsListener(Consumer> callback, Supplier isDisposed) { + this.callback = callback; + this.isDisposed = isDisposed; + } + + @Override + public void execute(Map result) { + callback.accept(result); + } + + @Override + public void exception(Throwable t) { + LOGGER.error("Could not listen ColorBarOptions", t); + } + + @Override + public boolean isDisposed() { + return isDisposed.get(); + } + } + + private static class ColorBarOptionsListener implements Listener { + + private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class); + + private Consumer callback; + private Supplier isDisposed; + + public ColorBarOptionsListener(Consumer callback, Supplier isDisposed) { + this.callback = callback; + this.isDisposed = isDisposed; + } + + @Override + public void execute(ColorBarOptions result) { + callback.accept(result); + } + + @Override + public void exception(Throwable t) { + LOGGER.error("Could not listen ColorBarOptions", t); + } + + @Override + public boolean isDisposed() { + return isDisposed.get(); + } + } + + private static class SizeBarOptionsRequest extends UnaryRead { + + public SizeBarOptionsRequest(Resource diagram) { + super(diagram); + } + + @Override + public SizeBarOptions perform(ReadGraph graph) throws DatabaseException { + return DistrictNetworkUtil.sizeBarOptions(graph, parameter); + } + } + + private static class SizeBarOptionsListener implements Listener { + + private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class); + + private Consumer callback; + private Supplier isDisposed; + + public SizeBarOptionsListener(Consumer callback, Supplier isDisposed) { + this.callback = callback; + this.isDisposed = isDisposed; + } + + @Override + public void execute(SizeBarOptions result) { + callback.accept(result); + } + + @Override + public void exception(Throwable t) { + LOGGER.error("Could not listen SizeBarOptions", t); + } + + @Override + public boolean isDisposed() { + return isDisposed.get(); + } + } + + private static class SizingObjectsRequest extends UnaryRead> { + + public SizingObjectsRequest(Resource diagram) { + super(diagram); + } + + @Override + public Map perform(ReadGraph graph) throws DatabaseException { + return DistrictNetworkUtil.sizeContributions(graph, parameter); + } + } + + private static class SizingObjectsListener implements Listener> { + + private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class); + + private Consumer> callback; + private Supplier isDisposed; + + public SizingObjectsListener(Consumer> callback, Supplier isDisposed) { + this.callback = callback; + this.isDisposed = isDisposed; + } + + @Override + public void execute(Map result) { + callback.accept(result); + } + + @Override + public void exception(Throwable t) { + LOGGER.error("Could not listen ColorBarOptions", t); + } + + @Override + public boolean isDisposed() { + return isDisposed.get(); + } + } }