Final push of district changes

[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 5155ccd2d54778c434f0d28d6c7462e929423d01..486f87596e9e4bab0fb7ea47bc1d8332a2f76682 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
@@ -3,6 +3,7 @@ package org.simantics.district.network.ui;
 import java.util.concurrent.TimeUnit;
 
 import org.simantics.district.network.ui.participants.DNPointerInteractor;
+import org.simantics.district.network.ui.participants.MapRulerPainter;
 import org.simantics.g2d.canvas.ICanvasContext;
 import org.simantics.g2d.canvas.impl.CanvasContext;
 import org.simantics.g2d.diagram.handler.PickRequest.PickFilter;
@@ -10,6 +11,8 @@ import org.simantics.g2d.diagram.participant.DelayedBatchElementPainter;
 import org.simantics.g2d.diagram.participant.ElementPainter;
 import org.simantics.g2d.diagram.participant.Selection;
 import org.simantics.g2d.diagram.participant.ZOrderHandler;
+import org.simantics.g2d.participant.BackgroundPainter;
+import org.simantics.g2d.participant.GridPainter;
 import org.simantics.g2d.participant.PanZoomRotateHandler;
 import org.simantics.g2d.participant.RenderingQualityInteractor;
 import org.simantics.maps.eclipse.MapPainter;
@@ -30,6 +33,10 @@ public class DistrictDiagramViewer extends DiagramViewer {
         ctx.add(new NetworkDrawingParticipant());
     }
     
+    protected String getPopupId() {
+        return "#DistrictDiagramPopup";
+    }
+    
     @Override
     public void initializeCanvasContext(CanvasContext ctx) {
         super.initializeCanvasContext(ctx);
@@ -43,4 +50,11 @@ public class DistrictDiagramViewer extends DiagramViewer {
         ctx.add(new RenderingQualityInteractor());
         ctx.add(new DelayedBatchElementPainter(PickFilter.FILTER_MONITORS, 500, TimeUnit.MILLISECONDS));
     }
+    
+    @Override
+    protected void addGridRulerBackgroundParticipants(CanvasContext ctx) {
+        ctx.add(new GridPainter());
+        ctx.add(new MapRulerPainter());
+        ctx.add(new BackgroundPainter());
+    }
 }