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.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 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
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);
+ Resource vf = DynamicVisualisations.getVisualisationFolder(graph, model);
if (vf != null) {
Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
if (activeVisualisation != null) {
- return DistrictNetworkUtil.colorBarOptions(graph, activeVisualisation);
+ return DynamicVisualisations.colorBarOptions(graph, activeVisualisation);
}
} else {
LOGGER.debug("No visualisation folder available for model {}", model);
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);
+ Resource vf = DynamicVisualisations.getVisualisationFolder(graph, model);
if (vf != null) {
Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
if (activeVisualisation != null) {
- return DistrictNetworkUtil.colorContributions(graph, activeVisualisation);
+ return DynamicVisualisations.colorContributions(graph, activeVisualisation);
}
} else {
LOGGER.debug("No visualisation folder available for model {}", model);
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;
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);
+ Resource vf = DynamicVisualisations.getVisualisationFolder(graph, model);
if (vf != null) {
Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
if (activeVisualisation != null) {
- return DistrictNetworkUtil.sizeBarOptions(graph, activeVisualisation);
+ return DynamicVisualisations.sizeBarOptions(graph, activeVisualisation);
}
} else {
LOGGER.debug("No visualisation folder available for model {}", model);
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);
+ Resource vf = DynamicVisualisations.getVisualisationFolder(graph, model);
if (vf != null) {
Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
if (activeVisualisation != null) {
- return DistrictNetworkUtil.sizeContributions(graph, activeVisualisation);
+ return DynamicVisualisations.sizeContributions(graph, activeVisualisation);
}
} else {
LOGGER.debug("No visualisation folder available for model {}", model);