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=642d02be63c575d73ea0aaedb2d8e4ab9a93b5e7;hb=00103b12908c5071e641ca2bea2c42030ff67770;hp=57480180f2e44807f5319ff878f1a93dea0f8061;hpb=16ee01dc5a40981c58fd5b478b89552e5814e8bb;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 57480180..642d02be 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
@@ -2,7 +2,14 @@ package org.simantics.district.network.ui;
 
 import java.util.concurrent.TimeUnit;
 
+import org.simantics.db.ReadGraph;
+import org.simantics.db.common.request.UniqueRead;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.procedure.Listener;
+import org.simantics.diagram.ui.DiagramModelHints;
+import org.simantics.district.network.DistrictNetworkUtil;
 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,14 +17,24 @@ 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.g2d.participant.ZoomToAreaHandler;
+import org.simantics.maps.MapScalingTransform;
 import org.simantics.maps.eclipse.MapPainter;
 import org.simantics.modeling.ui.diagramEditor.DiagramViewer;
+import org.simantics.scenegraph.g2d.events.command.CommandEvent;
+import org.simantics.scenegraph.g2d.events.command.Commands;
 import org.simantics.utils.datastructures.hints.IHintContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DistrictDiagramViewer extends DiagramViewer {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DistrictDiagramViewer.class);
+
     @Override
     protected void addDiagramParticipants(ICanvasContext ctx) {
         ctx.add(new ZOrderHandler());
@@ -25,9 +42,9 @@ public class DistrictDiagramViewer extends DiagramViewer {
         ctx.add(new ElementPainter());
         ctx.add(new DNPointerInteractor());
         
-        ctx.add(new MapPainter(100000));
+        ctx.add(new MapPainter(MapScalingTransform.INSTANCE));
         
-        ctx.add(new NetworkDrawingParticipant());
+        ctx.add(new NetworkDrawingParticipant(MapScalingTransform.INSTANCE));
     }
     
     protected String getPopupId() {
@@ -40,6 +57,7 @@ public class DistrictDiagramViewer extends DiagramViewer {
         IHintContext h = ctx.getDefaultHintContext();
         h.setHint(PanZoomRotateHandler.KEY_ZOOM_IN_LIMIT, 10000.0);
         h.setHint(PanZoomRotateHandler.KEY_ZOOM_OUT_LIMIT, 0.01);
+        h.setHint(DiagramModelHints.KEY_DIAGRAM_RESOURCE, diagramResource);
     }
 
     @Override
@@ -47,4 +65,49 @@ 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());
+    }
+    
+    protected void addViewManipulationParticipants(CanvasContext ctx) {
+        ctx.add(new DistrictPanZoomRotateHandler());
+        //ctx.add(new MousePanZoomInteractor());
+        //ctx.add(new MultitouchPanZoomRotateInteractor());
+        // ctx.add( new OrientationRestorer() );
+        ctx.add(new ZoomToAreaHandler());
+    }
+
+    @Override
+    protected void loadPageSettings(ICanvasContext ctx) {
+        super.loadPageSettings(ctx);
+        // this might be the wrong place to start such listening but at least
+        // super.loadPageSettings() does async-db-operations
+        sessionContext.getSession().asyncRequest(new UniqueRead<Boolean>() {
+
+            @Override
+            public Boolean perform(ReadGraph graph) throws DatabaseException {
+                return DistrictNetworkUtil.drawMapEnabled(graph, getInputResource());
+            }
+        }, new Listener<Boolean>() {
+
+            @Override
+            public void execute(Boolean result) {
+                canvasContext.getEventQueue().queueEvent(new CommandEvent(canvasContext, System.currentTimeMillis(), result ? Commands.MAP_ENABLE : Commands.MAP_DISABLE));
+            }
+
+            @Override
+            public void exception(Throwable t) {
+                LOGGER.error("Could not listen draw map for {}", getInputResource(), t);
+            }
+
+            @Override
+            public boolean isDisposed() {
+                return DistrictDiagramViewer.this.isDisposed();
+            }
+        });
+    }
 }