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=6175ace7cb1885d60d3f920ba551ae8fe3d92801;hb=835710a4f22ec2d91c287295fb176a0af62d1186;hp=c6c510e0a59d3546743ce68c0bd603003f599d91;hpb=404106a6a8c09ce3f320e8831894f4fe399662fc;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 c6c510e0..6175ace7 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 @@ -1,11 +1,18 @@ package org.simantics.district.network.ui; +import java.awt.Color; +import java.awt.geom.AffineTransform; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.function.Supplier; +import org.simantics.datatypes.literal.RGB; import org.simantics.db.ReadGraph; -import org.simantics.db.common.request.UniqueRead; +import org.simantics.db.Resource; +import org.simantics.db.common.request.UnaryRead; import org.simantics.db.exception.DatabaseException; 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.MapRulerPainter; @@ -20,9 +27,11 @@ import org.simantics.g2d.participant.BackgroundPainter; import org.simantics.g2d.participant.GridPainter; import org.simantics.g2d.participant.PanZoomRotateHandler; import org.simantics.g2d.participant.RenderingQualityInteractor; +import org.simantics.g2d.participant.TransformUtil; import org.simantics.g2d.participant.ZoomToAreaHandler; 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.CommandEvent; import org.simantics.scenegraph.g2d.events.command.Commands; @@ -41,9 +50,10 @@ public class DistrictDiagramViewer extends DiagramViewer { ctx.add(new ElementPainter()); ctx.add(new DNPointerInteractor()); - ctx.add(new MapPainter(MapScalingTransform.INSTANCE)); + AffineTransform tr = new AffineTransform(MapScalingTransform.INSTANCE); + ctx.add(new MapPainter(tr)); - ctx.add(new NetworkDrawingParticipant(MapScalingTransform.INSTANCE)); + ctx.add(new NetworkDrawingParticipant(tr)); } protected String getPopupId() { @@ -56,6 +66,7 @@ public class DistrictDiagramViewer extends DiagramViewer { IHintContext h = ctx.getDefaultHintContext(); 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); } @Override @@ -72,6 +83,11 @@ public class DistrictDiagramViewer extends DiagramViewer { } protected void addViewManipulationParticipants(CanvasContext ctx) { + // Let's replace with our special util + TransformUtil util = ctx.getAtMostOneItemOfClass(TransformUtil.class); + if (util != null) + ctx.remove(util); + ctx.add(new DistrictTransformUtil()); ctx.add(new DistrictPanZoomRotateHandler()); //ctx.add(new MousePanZoomInteractor()); //ctx.add(new MultitouchPanZoomRotateInteractor()); @@ -84,28 +100,107 @@ public class DistrictDiagramViewer extends DiagramViewer { super.loadPageSettings(ctx); // this might be the wrong place to start such listening but at least // super.loadPageSettings() does async-db-operations - sessionContext.getSession().asyncRequest(new UniqueRead() { - - @Override - public Boolean perform(ReadGraph graph) throws DatabaseException { - return DistrictNetworkUtil.drawMapEnabled(graph, getInputResource()); - } - }, new Listener() { - - @Override - public void execute(Boolean result) { - canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), result ? Commands.MAP_ENABLE : Commands.MAP_DISABLE)); - } - - @Override - public void exception(Throwable t) { - LOGGER.error("Could not listen draw map for {}", getInputResource(), t); - } - - @Override - public boolean isDisposed() { - return DistrictDiagramViewer.this.isDisposed(); - } - }); + setupDrawMapEnabled(); + setupBackgroundColor(); + } + + private void setupDrawMapEnabled() { + sessionContext.getSession().asyncRequest(new DrawMapEnabledRequest(getInputResource()), new DrawMapEnabledListener( + result -> canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), result ? Commands.MAP_ENABLE : Commands.MAP_DISABLE)), + () -> DistrictDiagramViewer.this.isDisposed())); + } + + private void setupBackgroundColor() { + sessionContext.getSession().asyncRequest(new MapBackgroundColorRequest(getInputResource()), new MapBackgroundColorListener( + 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); + canvasContext.getDefaultHintContext().setHint(MapCommands.KEY_MAP_BACKGROUND_COLOR, backgroundColor); + canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MapCommands.MAP_BACKGROUND_COLOR_CHANGE)); + } + } + + private static class DrawMapEnabledRequest extends UnaryRead { + + public DrawMapEnabledRequest(Resource diagram) { + super(diagram); + } + + @Override + public Boolean perform(ReadGraph graph) throws DatabaseException { + return DistrictNetworkUtil.drawMapEnabled(graph, parameter); + } + } + + private static class DrawMapEnabledListener implements Listener { + + private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class); + + private Consumer callback; + private Supplier isDisposed; + + public DrawMapEnabledListener(Consumer callback, Supplier isDisposed) { + this.callback = callback; + this.isDisposed = isDisposed; + } + + @Override + public void execute(Boolean result) { + callback.accept(result); + } + + @Override + public void exception(Throwable t) { + LOGGER.error("Could not listen if draw map is enabled", t); + } + + @Override + public boolean isDisposed() { + return isDisposed.get(); + } + } + + private static class MapBackgroundColorRequest extends UnaryRead { + + public MapBackgroundColorRequest(Resource diagram) { + super(diagram); + } + + @Override + public RGB.Integer perform(ReadGraph graph) throws DatabaseException { + return DistrictNetworkUtil.backgroundColor(graph, parameter); + } + } + + private static class MapBackgroundColorListener implements Listener { + + private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class); + + private Consumer callback; + private Supplier isDisposed; + + public MapBackgroundColorListener(Consumer callback, Supplier isDisposed) { + this.callback = callback; + this.isDisposed = isDisposed; + } + + @Override + public void execute(RGB.Integer result) { + callback.accept(result); + } + + @Override + public void exception(Throwable t) { + LOGGER.error("Could not listen map background color", t); + } + + @Override + public boolean isDisposed() { + return isDisposed.get(); + } } }