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=25956b31aaa701d772a2cc4fb3be0af0e7786c61;hb=7c1f539de88c6ca79b2ac6dc891be3f45282abe2;hp=c27b090db092f240f2bc3d0e43b0f4f5a3a0aaac;hpb=6b98761b9c2e9835629d2c0aabefe92657d6d36b;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 c27b090d..25956b31 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
@@ -19,6 +19,8 @@ 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;
@@ -41,10 +43,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;
@@ -68,9 +72,16 @@ public class DistrictDiagramViewer extends DiagramViewer {
         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() {
@@ -129,6 +140,25 @@ public class DistrictDiagramViewer extends DiagramViewer {
         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) {
+            for (DistrictDiagramViewerListener listener : listeners) {
+                listener.diagramDisposed(getRuntime(), canvasContext);
+            }
+        }
+        super.dispose();
     }
     
     private void setupDrawMapEnabled() {