Changeset 526 in josm for trunk/src/org

Timestamp:

2008-01-24T22:15:30+01:00 (16 years ago)

Author:

framm

Message:

• changed move mode to use an initial move threshold of 15 pixels, i.e. you have to move something farther than 15 pixels to initiate a move. configurable through option edit.initial-move-threshold.
• added the key combination shift+arrow keys to "nudge" selected objects by one pixel in either direction.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JosmAction.java (modified) (1 diff)
• actions/MoveAction.java (added)
• actions/mapmode/SelectAction.java (modified) (4 diffs)
• gui/MapFrame.java (modified) (1 diff)
• gui/MapView.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -26 +26 @@
 
         public JosmAction(String name, String iconName, String tooltip, int shortCut, int modifier, boolean register) {
-                super(name, ImageProvider.get(iconName));
+                super(name, iconName == null ? null : ImageProvider.get(iconName));
                 setHelpId();
                 String scl = ShortCutLabel.name(shortCut, modifier);

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

@@ -59 +59 @@
         /**
          * The time which needs to pass between click and release before something
-         * counts as a move
-         */
-        private int initialMoveDelay = 100;
-
+         * counts as a move, in milliseconds
+         */
+        private int initialMoveDelay = 200;
+
+        /**
+         * The screen distance which needs to be travelled before something
+         * counts as a move, in pixels
+         */
+        private int initialMoveThreshold = 15;
+        private boolean initialMoveThresholdExceeded = false;
         /**
          * Create a new SelectAction
@@ -73 +79 @@
                 putValue("help", "Action/Move/Move");
                 selectionManager = new SelectionManager(this, false, mapFrame.mapView);         
-                try { initialMoveDelay = Integer.parseInt(Main.pref.get("edit.initial-move-delay","100")); } catch (NumberFormatException x) {};
+                try { initialMoveDelay = Integer.parseInt(Main.pref.get("edit.initial-move-delay","200")); } catch (NumberFormatException x) {};
+                try { initialMoveThreshold = Integer.parseInt(Main.pref.get("edit.initial-move-threshold","15")); } catch (NumberFormatException x) {};
+                
         }
 
@@ -134 +142 @@
                 if (mousePos == null) {
                         mousePos = e.getPoint();
+                        return;
+                }
+                
+                if (!initialMoveThresholdExceeded) {
+                        int dxp = mousePos.x - e.getX();
+                        int dyp = mousePos.y - e.getY();
+                        int dp = (int) Math.sqrt(dxp*dxp+dyp*dyp);
+                        if (dp < initialMoveThreshold) return;
+                        initialMoveThresholdExceeded = true;
                 }
                 
@@ -201 +218 @@
                 mouseDownTime = System.currentTimeMillis();
                 didMove = false;
+                initialMoveThresholdExceeded = false;
 
                 Collection<OsmPrimitive> osmColl =

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

@@ -10 +10 @@
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
+import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JToolBar;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.actions.mapmode.DrawAction;

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

@@ -9 +9 @@
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
+import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14 +15 @@
 import java.util.LinkedList;
 
+import javax.swing.JComponent;
 import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -30 +34 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.ModifiedChangedListener;
+
+import com.sun.corba.se.impl.oa.poa.ActiveObjectMap.Key;
 
 /**
@@ -82 +88 @@
 
                                 new MapMover(MapView.this, Main.contentPane);
+                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, java.awt.event.InputEvent.SHIFT_MASK), "UP");
+                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, java.awt.event.InputEvent.SHIFT_MASK), "DOWN");
+                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, java.awt.event.InputEvent.SHIFT_MASK), "LEFT");
+                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, java.awt.event.InputEvent.SHIFT_MASK), "RIGHT");
+
+                                Main.contentPane.getActionMap().put("UP", new MoveAction(MoveAction.Direction.UP));
+                                Main.contentPane.getActionMap().put("DOWN", new MoveAction(MoveAction.Direction.DOWN));
+                                Main.contentPane.getActionMap().put("LEFT", new MoveAction(MoveAction.Direction.LEFT));
+                                Main.contentPane.getActionMap().put("RIGHT", new MoveAction(MoveAction.Direction.RIGHT));
+                                
 
                                 MapSlider zoomSlider = new MapSlider(MapView.this);