Optimization of district scene graph node rendering

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / DistrictDiagramViewer.java

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 d932e0834a2cd2016c3092e5581850c24338af07..d0b1a8a1ac9d6a1e5dd73848815d74c17d72c523 100644 (file)
--- 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
@@ -4,6 +4,7 @@ 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;
@@ -18,10 +19,12 @@ 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.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;
@@ -39,10 +42,12 @@ 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.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;
@@ -54,7 +59,6 @@ import org.slf4j.LoggerFactory;
 
 public class DistrictDiagramViewer extends DiagramViewer {
 
-    @SuppressWarnings("unused")
        private static final Logger LOGGER = LoggerFactory.getLogger(DistrictDiagramViewer.class);
 
     @Override
@@ -70,12 +74,24 @@ public class DistrictDiagramViewer extends DiagramViewer {
         ctx.add(new NetworkDrawingParticipant(tr));
         ctx.add(new ElevationServerParticipant(tr));
         ctx.add(new DynamicVisualisationContributionsParticipant(tr));
+        
+        // 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);
@@ -227,6 +243,8 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         private Consumer<Boolean> callback;
         private Supplier<Boolean> isDisposed;
+        
+        private Boolean lastResult;
 
         public DrawMapEnabledListener(Consumer<Boolean> callback, Supplier<Boolean> isDisposed) {
             this.callback = callback;
@@ -235,7 +253,11 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         @Override
         public void execute(Boolean result) {
-            callback.accept(result);
+            // Minor optimization
+            if (!Objects.equals(lastResult, result)) {
+                lastResult = result;
+                callback.accept(result);
+            }
         }
 
         @Override
@@ -267,6 +289,8 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         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;
@@ -275,7 +299,10 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         @Override
         public void execute(RGB.Integer result) {
-            callback.accept(result);
+            if (!Objects.equals(lastResult, result)) {
+                lastResult = result;
+                callback.accept(result);
+            }
         }
 
         @Override
@@ -299,11 +326,11 @@ public class DistrictDiagramViewer extends DiagramViewer {
         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);
@@ -322,11 +349,11 @@ public class DistrictDiagramViewer extends DiagramViewer {
         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);
@@ -341,6 +368,8 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         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;
@@ -401,11 +430,11 @@ public class DistrictDiagramViewer extends DiagramViewer {
         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);
@@ -452,11 +481,11 @@ public class DistrictDiagramViewer extends DiagramViewer {
         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);