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=c6c510e0a59d3546743ce68c0bd603003f599d91;hb=refs%2Fchanges%2F21%2F2421%2F2;hp=47a7bc5f12570f26a55cf9182a19835329574150;hpb=02ecca5e61d2eb17de40cc058be678b414aaad00;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 47a7bc5f..c6c510e0 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,6 +2,11 @@ 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.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;
@@ -15,12 +20,20 @@ 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());
@@ -28,9 +41,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() {
@@ -41,7 +54,7 @@ public class DistrictDiagramViewer extends DiagramViewer {
     public void initializeCanvasContext(CanvasContext ctx) {
         super.initializeCanvasContext(ctx);
         IHintContext h = ctx.getDefaultHintContext();
-        h.setHint(PanZoomRotateHandler.KEY_ZOOM_IN_LIMIT, 1000000.0);
+        h.setHint(PanZoomRotateHandler.KEY_ZOOM_IN_LIMIT, 10000.0);
         h.setHint(PanZoomRotateHandler.KEY_ZOOM_OUT_LIMIT, 0.01);
     }
 
@@ -57,4 +70,42 @@ public class DistrictDiagramViewer extends DiagramViewer {
         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();
+            }
+        });
+    }
 }