Changeset 7009 in josm for trunk/src/org

Timestamp:

2014-04-27T12:43:55+02:00 (11 years ago)

Author:

akks

Message:

see #9952: added parameter extrude.initial-move-threshold (to tune ignoring small movements in extrude mode)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/ExtrudeAction.java (modified) (4 diffs)
• actions/mapmode/SelectAction.java (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

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

@@ -112 +112 @@
     private int initialMoveDelay = 200;
     /**
+     * The minimal shift of mouse (in pixels) befire something counts as move
+     */
+    private int initialMoveThreshold = 10;
+
+    /**
      * The initial EastNorths of node1 and node2
      */
@@ -209 +214 @@
         }
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200);
+        initialMoveThreshold = Main.pref.getInteger("extrude.initial-move-threshold", 10);
         mainColor = Main.pref.getColor(marktr("Extrude: main line"), null);
         if (mainColor == null) mainColor = PaintColors.SELECTED.get();
@@ -362 +368 @@
         } else {
             if (mode == Mode.create_new) {
-                if (e.getPoint().distance(initialMousePos) > 10 && newN1en != null) {
+                if (e.getPoint().distance(initialMousePos) > initialMoveThreshold && newN1en != null) {
                     createNewRectangle();
                 }
@@ -370 +376 @@
                     addNewNode(e);
                 }
-                else if (e.getPoint().distance(initialMousePos) > 10 && newN1en != null && selectedSegment != null) {
+                else if (e.getPoint().distance(initialMousePos) > initialMoveThreshold && newN1en != null && selectedSegment != null) {
                     // main extrusion commands
                     performExtrusion();

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

@@ -174 +174 @@
         putValue("help", ht("/Action/Select"));
         selectionManager = new SelectionManager(this, false, mv);
-        initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay", 200);
-        initialMoveThreshold = Main.pref.getInteger("edit.initial-move-threshold", 5);
     }
 
@@ -185 +183 @@
         mv.setVirtualNodesEnabled(Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0);
         drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true);
+        initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay", 200);
+        initialMoveThreshold = Main.pref.getInteger("edit.initial-move-threshold", 5);
         cycleManager.init();
         virtualManager.init();

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -75 +75 @@
     private static final int MILLIS_OF_DAY = 86400000;
 
-    // Should us keep "%" character when fixing URL or encode it? Let us keep them for now, see #9937
     public static final String URL_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=%";