Changeset 3837 in josm for trunk/src

Timestamp:

2011-02-01T01:49:32+01:00 (13 years ago)

Author:

framm

Message:

new viewport following function; moves the viewport so that the last placed
node is in the center. the idea is to greatly improve tracing of long, linear
features from imagery or tracks (no need to right-click and pan all the time),
however the execution still leaves to be desired; problem is that after you
have placed a node you have to wait for the movement to finish before you can
place the next node. possible enhancements: only scroll if placed node is on
the outer rim of viewport?

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ViewportFollowToggleAction.java (added)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• data/coor/EastNorth.java (modified) (1 diff)
• gui/MainMenu.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -559 +559 @@
         getCurrentDataSet().setSelected(newSelection);
 
+        // "viewport following" mode for tracing long features 
+        // from aerial imagery or GPS tracks. 
+        if (n != null && Main.map.mapView.viewportFollowing) {
+            Main.map.mapView.smoothScrollTo(n.getEastNorth());
+        };
         computeHelperLine();
         removeHighlighting();

trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

@@ -34 +34 @@
     public EastNorth getCenter(EastNorth en2) {
         return new EastNorth((this.x + en2.x)/2.0, (this.y + en2.y)/2.0);
+    }
+
+    public double distance(EastNorth en2) {
+        return Math.sqrt((this.x-en2.x)*(this.x-en2.x) + (this.y-en2.y)*(this.y-en2.y));
     }
 

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -74 +74 @@
 import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.actions.UploadSelectionAction;
+import org.openstreetmap.josm.actions.ViewportFollowToggleAction;
 import org.openstreetmap.josm.actions.WireframeToggleAction;
 import org.openstreetmap.josm.actions.ZoomInAction;
@@ -286 +287 @@
         }
 
+        // -- viewport follow toggle action
+        ViewportFollowToggleAction viewportFollowToggleAction = new ViewportFollowToggleAction();
+        final JCheckBoxMenuItem vft = new JCheckBoxMenuItem(viewportFollowToggleAction);
+        viewMenu.add(vft);
+        vft.setAccelerator(viewportFollowToggleAction.getShortcut().getKeyStroke());
+        viewportFollowToggleAction.addButtonModel(vft.getModel());
+
         // -- changeset manager toggle action
         ChangesetManagerToggleAction changesetManagerToggleAction = new ChangesetManagerToggleAction();

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -82 +82 @@
     }
 
+    public boolean viewportFollowing = false;
+
     /**
      * the layer listeners

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -23 +23 @@
 
 import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -356 +357 @@
     }
 
+    public void smoothScrollTo(LatLon newCenter) {
+        if (newCenter instanceof CachedLatLon) {
+            smoothScrollTo(((CachedLatLon)newCenter).getEastNorth());
+        } else {
+            smoothScrollTo(getProjection().latlon2eastNorth(newCenter));
+        }
+    }
+
+    /**
+     * Create a thread that moves the viewport to the given center in an 
+     * animated fashion.
+     */
+    public void smoothScrollTo(EastNorth newCenter) {
+        // fixme make these configurable.
+        final int fps = 20;     // animation frames per second
+        final int speed = 1500; // milliseconds for full-screen-width pan
+        if (!newCenter.equals(center)) {
+            final EastNorth oldCenter = center;
+            final double distance = newCenter.distance(oldCenter) / scale;
+            final double milliseconds = distance / getWidth() * speed;
+            final double frames = milliseconds * fps / 1000;
+            final EastNorth finalNewCenter = newCenter;
+
+            // we attempt to smooth-scroll at 10 fps, and use 2 seconds to scroll one 
+            // screen width.
+
+            new Thread(
+                new Runnable() {
+                    public void run() {
+                        for (int i=0; i<frames; i++)
+                        {
+                            // fixme - not use zoom history here
+                            zoomTo(oldCenter.interpolate(finalNewCenter, (double) (i+1) / (double) frames));
+                            try { Thread.sleep(1000 / fps); } catch (InterruptedException ex) { };
+                        }
+                    }
+                }
+            ).start();
+        }
+    }
+
     public void zoomToFactor(double x, double y, double factor) {
         double newScale = scale*factor;