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.PossibleIndexRoot;
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.internal.Activator;
+import org.simantics.district.network.ui.nodes.DistrictRenderingPreparationNode;
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;
import org.simantics.g2d.participant.RenderingQualityInteractor;
import org.simantics.g2d.participant.TransformUtil;
import org.simantics.g2d.participant.ZoomToAreaHandler;
+import org.simantics.g2d.scenegraph.SceneGraphConstants;
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.G2DParentNode;
import org.simantics.scenegraph.g2d.events.command.Command;
import org.simantics.scenegraph.g2d.events.command.CommandEvent;
import org.simantics.scenegraph.g2d.events.command.Commands;
public class DistrictDiagramViewer extends DiagramViewer {
- @SuppressWarnings("unused")
private static final Logger LOGGER = LoggerFactory.getLogger(DistrictDiagramViewer.class);
@Override
AffineTransform tr = new AffineTransform(MapScalingTransform.INSTANCE);
ctx.add(new MapPainter(tr));
- ctx.add(new NetworkDrawingParticipant(tr));
+ DynamicVisualisationContributionsParticipant dynamicVisualisationContributionsParticipant = new DynamicVisualisationContributionsParticipant(tr);
+ ctx.add(new NetworkDrawingParticipant(dynamicVisualisationContributionsParticipant, tr));
ctx.add(new ElevationServerParticipant(tr));
- ctx.add(new DynamicVisualisationContributionsParticipant(tr));
+ ctx.add(dynamicVisualisationContributionsParticipant);
+
+ // Optimize AffineTransform memory allocations during district diagram rendering
+ G2DParentNode spatialRoot = (G2DParentNode) ctx.getSceneGraph().lookupNode(SceneGraphConstants.SPATIAL_ROOT_NODE_ID);
+ DistrictRenderingPreparationNode prepNode = new DistrictRenderingPreparationNode();
+ prepNode.setZIndex(Integer.MIN_VALUE / 2);
+ spatialRoot.addNode("districtRenderingPrepareNode", prepNode);
}
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);
setupColorBarOptions();
setupSizingObjects();
setupSizeBarOptions();
+
+ // add listeners
+ DistrictDiagramViewerListener[] listeners = Activator.getInstance().getDistrictDiagramViewerListeners();
+ if (listeners != null) {
+ for (DistrictDiagramViewerListener listener : listeners) {
+ listener.diagramLoaded(getRuntime(), canvasContext);
+ }
+ }
+ }
+
+ @Override
+ public void dispose() {
+ DistrictDiagramViewerListener[] listeners = Activator.getInstance().getDistrictDiagramViewerListeners();
+ if (listeners != null) {
+ Resource runtime = getRuntime();
+ for (DistrictDiagramViewerListener listener : listeners) {
+ listener.diagramDisposed(runtime, canvasContext);
+ }
+ }
+ super.dispose();
}
private void setupDrawMapEnabled() {
private void queueColoringObjectsChangeEvent(Map<String, DynamicColorContribution> result) {
- if (result != null && !canvasContext.isDisposed()) {
- canvasContext.getDefaultHintContext().setHint(KEY_MAP_COLORING_OBJECTS, result);
- canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_COLORING_OBJECTS_CHANGE));
- } else {
- LOGGER.info("Result is either null or canvasContext is disposed", String.valueOf(result));
- }
+ queueEventInternal(KEY_MAP_COLORING_OBJECTS, MAP_COLORING_OBJECTS_CHANGE, result);
}
private void queueColorBarOptionsChangeEvent(ColorBarOptions result) {
- if (result != null && !canvasContext.isDisposed()) {
- canvasContext.getDefaultHintContext().setHint(KEY_MAP_COLOR_BAR_OPTIONS, result);
- canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_COLOR_BAR_OPTIONS_CHANGE));
- } else {
- LOGGER.info("Result is either null or canvasContext is disposed", String.valueOf(result));
- }
+ queueEventInternal(KEY_MAP_COLOR_BAR_OPTIONS, MAP_COLOR_BAR_OPTIONS_CHANGE, result);
}
private void queueSizingObjectsChangeEvent(Map<String, DynamicSizeContribution> result) {
- if (result != null && !canvasContext.isDisposed()) {
- canvasContext.getDefaultHintContext().setHint(KEY_MAP_SIZING_OBJECTS, result);
- canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_SIZING_OBJECTS_CHANGE));
- } else {
- LOGGER.info("Result is either null or canvasContext is disposed", String.valueOf(result));
- }
+ queueEventInternal(KEY_MAP_SIZING_OBJECTS, MAP_SIZING_OBJECTS_CHANGE, result);
}
private void queueSizeBarOptionsChangeEvent(SizeBarOptions result) {
+ 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.getDefaultHintContext().setHint(KEY_MAP_SIZE_BAR_OPTIONS, result);
- canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), MAP_SIZE_BAR_OPTIONS_CHANGE));
+ 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 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 {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource model = graph.syncRequest(new IndexRoot(parameter));
- Resource vf = DistrictNetworkUtil.getVisualisationFolder(graph, model);
- if (vf != null) {
- Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
- if (activeVisualisation != null) {
- return DistrictNetworkUtil.colorBarOptions(graph, activeVisualisation);
+ Resource model = graph.syncRequest(new PossibleIndexRoot(parameter));
+ if (model != null) {
+ 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);
}
- } else {
- LOGGER.debug("No visualisation folder available for model {}", model);
}
return ColorBarOptions.useDefault();
}
@Override
public Map<String, DynamicColorContribution> perform(ReadGraph graph) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource model = graph.syncRequest(new IndexRoot(parameter));
- Resource vf = DistrictNetworkUtil.getVisualisationFolder(graph, model);
- if (vf != null) {
- Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
- if (activeVisualisation != null) {
- return DistrictNetworkUtil.colorContributions(graph, activeVisualisation);
+ Resource model = graph.syncRequest(new PossibleIndexRoot(parameter));
+ if (model != null) {
+ 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);
}
- } else {
- LOGGER.debug("No visualisation folder available for model {}", model);
}
return Collections.emptyMap();
}
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;
@Override
public SizeBarOptions perform(ReadGraph graph) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource model = graph.syncRequest(new IndexRoot(parameter));
- Resource vf = DistrictNetworkUtil.getVisualisationFolder(graph, model);
- if (vf != null) {
- Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
- if (activeVisualisation != null) {
- return DistrictNetworkUtil.sizeBarOptions(graph, activeVisualisation);
+ Resource model = graph.syncRequest(new PossibleIndexRoot(parameter));
+ if (model != null) {
+ 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);
}
- } else {
- LOGGER.debug("No visualisation folder available for model {}", model);
}
return SizeBarOptions.useDefault();
}
@Override
public Map<String, DynamicSizeContribution> perform(ReadGraph graph) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource model = graph.syncRequest(new IndexRoot(parameter));
- Resource vf = DistrictNetworkUtil.getVisualisationFolder(graph, model);
- if (vf != null) {
- Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
- if (activeVisualisation != null) {
- return DistrictNetworkUtil.sizeContributions(graph, activeVisualisation);
+ Resource model = graph.syncRequest(new PossibleIndexRoot(parameter));
+ if (model != null) {
+ 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);
}
- } else {
- LOGGER.debug("No visualisation folder available for model {}", model);
}
return Collections.emptyMap();
}
Code Review / simantics / district.git / blobdiff