import java.awt.Color;
import java.awt.geom.AffineTransform;
+import java.util.Collections;
import java.util.Map;
+import java.util.Objects;
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.Resource;
+import org.simantics.db.common.request.IndexRoot;
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.ontology.DistrictNetworkResource;
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.DynamicVisualisations;
import org.simantics.district.network.visualisations.model.ColorBarOptions;
import org.simantics.district.network.visualisations.model.DynamicColorContribution;
import org.simantics.district.network.visualisations.model.DynamicSizeContribution;
public class DistrictDiagramViewer extends DiagramViewer {
- @SuppressWarnings("unused")
private static final Logger LOGGER = LoggerFactory.getLogger(DistrictDiagramViewer.class);
@Override
protected String getPopupId() {
return "#DistrictDiagramPopup";
}
-
+
+ @Override
+ protected void fillInitialDiagramHints(Resource diagram, IHintContext initialHints) throws DatabaseException {
+ super.fillInitialDiagramHints(diagram, initialHints);
+
+ }
+
@Override
public void initializeCanvasContext(CanvasContext ctx) {
super.initializeCanvasContext(ctx);
private void queueColoringObjectsChangeEvent(Map<String, DynamicColorContribution> result) {
- if (result != null) {
- canvasContext.getDefaultHintContext().setHint(KEY_MAP_COLORING_OBJECTS, result);
- canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_COLORING_OBJECTS_CHANGE));
- }
+ queueEventInternal(KEY_MAP_COLORING_OBJECTS, MAP_COLORING_OBJECTS_CHANGE, result);
}
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));
- }
+ queueEventInternal(KEY_MAP_COLOR_BAR_OPTIONS, MAP_COLOR_BAR_OPTIONS_CHANGE, result);
}
private void queueSizingObjectsChangeEvent(Map<String, DynamicSizeContribution> result) {
- if (result != null) {
- canvasContext.getDefaultHintContext().setHint(KEY_MAP_SIZING_OBJECTS, result);
- canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_SIZING_OBJECTS_CHANGE));
- }
+ queueEventInternal(KEY_MAP_SIZING_OBJECTS, MAP_SIZING_OBJECTS_CHANGE, result);
}
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));
+ queueEventInternal(KEY_MAP_SIZE_BAR_OPTIONS, MAP_SIZE_BAR_OPTIONS_CHANGE, result);
+ }
+
+ private void queueEventInternal(Key key, Command command, Object result) {
+ if (result != null && !canvasContext.isDisposed()) {
+ canvasContext.getThreadAccess().asyncExec(() -> {
+ canvasContext.getDefaultHintContext().setHint(key, result);
+ canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), command));
+ });
+ } else {
+ LOGGER.info("Result is either null or canvasContext is disposed", String.valueOf(result));
}
}
-
+
private static class DrawMapEnabledRequest extends UnaryRead<Resource, Boolean> {
public DrawMapEnabledRequest(Resource diagram) {
private Consumer<Boolean> callback;
private Supplier<Boolean> isDisposed;
+
+ private Boolean lastResult;
public DrawMapEnabledListener(Consumer<Boolean> callback, Supplier<Boolean> isDisposed) {
this.callback = callback;
@Override
public void execute(Boolean result) {
- callback.accept(result);
+ // Minor optimization
+ if (!Objects.equals(lastResult, result)) {
+ lastResult = result;
+ callback.accept(result);
+ }
}
@Override
private static class MapBackgroundColorListener implements Listener<RGB.Integer> {
- private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MapBackgroundColorListener.class);
private Consumer<RGB.Integer> callback;
private Supplier<Boolean> isDisposed;
+
+ private RGB.Integer lastResult;
public MapBackgroundColorListener(Consumer<RGB.Integer> callback, Supplier<Boolean> isDisposed) {
this.callback = callback;
@Override
public void execute(RGB.Integer result) {
- callback.accept(result);
+ if (!Objects.equals(lastResult, result)) {
+ lastResult = result;
+ callback.accept(result);
+ }
}
@Override
@Override
public ColorBarOptions perform(ReadGraph graph) throws DatabaseException {
- return DistrictNetworkUtil.colorBarOptions(graph, parameter);
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ Resource model = graph.syncRequest(new IndexRoot(parameter));
+ Resource vf = DynamicVisualisations.getVisualisationFolder(graph, model);
+ if (vf != null) {
+ Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
+ if (activeVisualisation != null) {
+ return DynamicVisualisations.colorBarOptions(graph, activeVisualisation);
+ }
+ } else {
+ LOGGER.debug("No visualisation folder available for model {}", model);
+ }
+ return ColorBarOptions.useDefault();
}
}
@Override
public Map<String, DynamicColorContribution> perform(ReadGraph graph) throws DatabaseException {
- return DistrictNetworkUtil.colorContributions(graph, parameter);
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ Resource model = graph.syncRequest(new IndexRoot(parameter));
+ Resource vf = DynamicVisualisations.getVisualisationFolder(graph, model);
+ if (vf != null) {
+ Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
+ if (activeVisualisation != null) {
+ return DynamicVisualisations.colorContributions(graph, activeVisualisation);
+ }
+ } else {
+ LOGGER.debug("No visualisation folder available for model {}", model);
+ }
+ return Collections.emptyMap();
}
}
private static class ColoringObjectsListener implements Listener<Map<String,DynamicColorContribution>> {
- private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ColoringObjectsListener.class);
private Consumer<Map<String,DynamicColorContribution>> callback;
private Supplier<Boolean> isDisposed;
+
+ //private Map<String, DynamicColorContribution> lastResult
public ColoringObjectsListener(Consumer<Map<String,DynamicColorContribution>> callback, Supplier<Boolean> isDisposed) {
this.callback = callback;
private static class ColorBarOptionsListener implements Listener<ColorBarOptions> {
- private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ColorBarOptionsListener.class);
private Consumer<ColorBarOptions> callback;
private Supplier<Boolean> isDisposed;
@Override
public SizeBarOptions perform(ReadGraph graph) throws DatabaseException {
- return DistrictNetworkUtil.sizeBarOptions(graph, parameter);
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ Resource model = graph.syncRequest(new IndexRoot(parameter));
+ Resource vf = DynamicVisualisations.getVisualisationFolder(graph, model);
+ if (vf != null) {
+ Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
+ if (activeVisualisation != null) {
+ return DynamicVisualisations.sizeBarOptions(graph, activeVisualisation);
+ }
+ } else {
+ LOGGER.debug("No visualisation folder available for model {}", model);
+ }
+ return SizeBarOptions.useDefault();
}
}
private static class SizeBarOptionsListener implements Listener<SizeBarOptions> {
- private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SizeBarOptionsListener.class);
private Consumer<SizeBarOptions> callback;
private Supplier<Boolean> isDisposed;
@Override
public Map<String, DynamicSizeContribution> perform(ReadGraph graph) throws DatabaseException {
- return DistrictNetworkUtil.sizeContributions(graph, parameter);
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ Resource model = graph.syncRequest(new IndexRoot(parameter));
+ Resource vf = DynamicVisualisations.getVisualisationFolder(graph, model);
+ if (vf != null) {
+ Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
+ if (activeVisualisation != null) {
+ return DynamicVisualisations.sizeContributions(graph, activeVisualisation);
+ }
+ } else {
+ LOGGER.debug("No visualisation folder available for model {}", model);
+ }
+ return Collections.emptyMap();
}
}
private static class SizingObjectsListener implements Listener<Map<String,DynamicSizeContribution>> {
- private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SizingObjectsListener.class);
private Consumer<Map<String,DynamicSizeContribution>> callback;
private Supplier<Boolean> isDisposed;