Improve HoverInfoStyle performance for district network diagrams

[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 d0b1a8a1ac9d6a1e5dd73848815d74c17d72c523..25956b31aaa701d772a2cc4fb3be0af0e7786c61 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
@@ -19,6 +19,7 @@ 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;
@@ -71,9 +72,10 @@ 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);
@@ -138,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() {