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=9d07f0378a18e69fd9252200b06a4000b3ff2233;hb=refs%2Fchanges%2F71%2F1971%2F3;hp=486f87596e9e4bab0fb7ea47bc1d8332a2f76682;hpb=1bc60c2213f9b3fc7b4d935ba9afda2b767290e5;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 486f8759..9d07f037 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
@@ -15,6 +15,8 @@ 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.utils.datastructures.hints.IHintContext;
@@ -28,9 +30,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,8 +43,8 @@ public class DistrictDiagramViewer extends DiagramViewer {
     public void initializeCanvasContext(CanvasContext ctx) {
         super.initializeCanvasContext(ctx);
         IHintContext h = ctx.getDefaultHintContext();
-        h.setHint(PanZoomRotateHandler.KEY_ZOOM_IN_LIMIT, 10000.0);
-        h.setHint(PanZoomRotateHandler.KEY_ZOOM_OUT_LIMIT, 0.01);
+        h.setHint(PanZoomRotateHandler.KEY_ZOOM_IN_LIMIT, 1000000.0);
+        h.setHint(PanZoomRotateHandler.KEY_ZOOM_OUT_LIMIT, 0.003);
     }
 
     @Override
@@ -57,4 +59,13 @@ 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());
+    }
+
 }