X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FDistrictPanZoomRotateHandler.java;fp=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FDistrictPanZoomRotateHandler.java;h=f9d9fccca449b8a265d4f0983d41952138cd39e8;hb=835710a4f22ec2d91c287295fb176a0af62d1186;hp=1a4f83d8aaea80ddee799f399d4a0f68084bbbe3;hpb=6efcc2873091c30cbc6dbc47f5601bd62813b99f;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictPanZoomRotateHandler.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictPanZoomRotateHandler.java
index 1a4f83d8..f9d9fccc 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictPanZoomRotateHandler.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictPanZoomRotateHandler.java
@@ -1,23 +1,117 @@
 package org.simantics.district.network.ui;
 
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.util.Set;
+
+import org.simantics.g2d.canvas.ICanvasContext;
+import org.simantics.g2d.canvas.impl.DependencyReflection.Dependency;
+import org.simantics.g2d.canvas.impl.DependencyReflection.Reference;
+import org.simantics.g2d.diagram.participant.Selection;
+import org.simantics.g2d.element.ElementUtils;
+import org.simantics.g2d.element.IElement;
+import org.simantics.g2d.participant.CanvasBoundsParticipant;
 import org.simantics.g2d.participant.PanZoomRotateHandler;
+import org.simantics.maps.MapScalingTransform;
+import org.simantics.scenegraph.g2d.events.EventHandlerReflection.EventHandler;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseWheelMovedEvent;
+import org.simantics.scenegraph.g2d.events.command.Command;
+import org.simantics.scenegraph.g2d.events.command.CommandEvent;
+import org.simantics.scenegraph.g2d.events.command.Commands;
 import org.simantics.scenegraph.g2d.nodes.NavigationNode;
 
 public class DistrictPanZoomRotateHandler extends PanZoomRotateHandler {
 
+    public static final int DISTRICT_TRANSLATE_AMOUNT = 2;
+
+    @Dependency DistrictTransformUtil util;
+    @Reference  Selection selection;
+
     public DistrictPanZoomRotateHandler() {
     }
+    
+    @Override
+    public void addedToContext(ICanvasContext ctx) {
+        super.addedToContext(ctx);
+        setHint(KEY_TRANSLATE_AMOUNT, DISTRICT_TRANSLATE_AMOUNT);
+    }
 
     @Override
     protected Class<? extends NavigationNode> getNavigationNodeClass() {
         return DistrictNavigationNode.class;
     }
 
+    @Override
+    public double getTranslateAmount() {
+        return 15 * super.getTranslateAmount();
+    }
+    
+    @Override
+    public double limitScaleFactor(double scaleFactor) {
+        return scaleFactor;
+    }
+    
+    @Override
+    @EventHandler(priority = 1)
+    public boolean handleEvent(CommandEvent e) {
+        super.update();
+        Command c = e.command;
+        boolean zoomDisabled = Boolean.TRUE.equals(getHint(KEY_DISABLE_ZOOM)) ? true : false;
+        // custom handling of zoom to fit & selection
+        if (Commands.ZOOM_TO_FIT.equals(c) && !zoomDisabled) {
+            boolean result = zoomToFit();
+            if (!result)
+                result = zoomToPage();
+            return result;
+        }
+        if (Commands.ZOOM_TO_PAGE.equals(c) && !zoomDisabled) {
+            return zoomToPage();
+        }
+        if (Commands.ZOOM_TO_SELECTION.equals(c) && !zoomDisabled) {
+            return zoomToSelection();
+        }
+        return super.handleEvent(e);
+    }
+
+    private boolean zoomToFit() {
+        return false;
+    }
+
+    private boolean zoomToPage() {
+        int currentZoomLevel = MapScalingTransform.zoomLevel(util.getTransform());
+        
+        util.setTransform(new AffineTransform(2,0,0,2,270,270));
+//        util.setTransform(new AffineTransform(MapScalingTransform.INSTANCE));
+        return true;
+    }
+    
+    private boolean zoomToSelection() {
+        CanvasBoundsParticipant boundsParticipant = getContext().getAtMostOneItemOfClass(CanvasBoundsParticipant.class);
+        if (boundsParticipant == null)
+            return false;
+
+        final Rectangle2D controlBounds = boundsParticipant.getControlBounds().getFrame();
+        if (controlBounds == null || controlBounds.isEmpty())
+            return false;
+        
+        Set<IElement> selections = selection.getAllSelections();
+        Rectangle2D diagramRect = ElementUtils.getSurroundingElementBoundsOnDiagram(selections);
+        
+        // Make sure that even empty bounds can be zoomed into.
+        org.simantics.scenegraph.utils.GeometryUtils.expandRectangle(diagramRect, 1);
+        
+        util.fitArea(controlBounds, diagramRect, null);
+        return true;
+    }
+
     public static class DistrictNavigationNode extends NavigationNode {
 
         private static final long serialVersionUID = 5452897272925816875L;
 
+        public DistrictNavigationNode() {
+            setAdaptViewportToResizedControl(false);
+        }
+
         @Override
         public Double getZoomInLimit() {
             return super.getZoomInLimit();
@@ -28,23 +122,40 @@ public class DistrictPanZoomRotateHandler extends PanZoomRotateHandler {
             return super.getZoomOutLimit();
         }
 
+        @Override
+        public void setAdaptViewportToResizedControl(Boolean adapt) {
+            super.setAdaptViewportToResizedControl(false);
+            // no op
+        }
+
+        @Override
+        public boolean getAdaptViewportToResizedControl() {
+            return false;
+        }
+
         @Override
         public boolean mouseWheelMoved(MouseWheelMovedEvent me) {
             if (navigationEnabled && zoomEnabled) {
-                double scroll = Math.min(0.9, -me.wheelRotation / 20.0);
-                double z = 1 - scroll;
+                double z;
+                if (me.wheelRotation > 0) {
+                    z = DISTRICT_TRANSLATE_AMOUNT;
+                } else {
+                    z = 1.0d / DISTRICT_TRANSLATE_AMOUNT;
+                }
+                //double scroll = Math.min(0.9, -me.wheelRotation / 20.0);
+                //double z = 1 - scroll;
                 double dx = (me.controlPosition.getX() - transform.getTranslateX()) / transform.getScaleX();
                 double dy = (me.controlPosition.getY() - transform.getTranslateY()) / transform.getScaleY();
                 dx = dx * (1 - z);
                 dy = dy * (1 - z);
-                double limitedScale = limitScaleFactor(z);
-                if (limitedScale != 1.0) {
+//                double limitedScale = limitScaleFactor(z);
+//                if (limitedScale != 1.0) {
                     translate(dx, dy);
                     scale(z, z);
                     transformChanged();
                     dropQuality();
                     repaint();
-                }
+//                }
             }
             return false;
         }