Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 5393) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 5394) @@ -177,4 +177,6 @@ mv.setVirtualNodesEnabled(Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0); drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true); + cycleManager.init(); + virtualManager.init(); // This is required to update the cursors when ctrl/shift/alt is pressed try { @@ -375,6 +377,7 @@ @Override public void mousePressed(MouseEvent e) { + mouseDownButton = e.getButton(); // return early - if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || (mouseDownButton = e.getButton()) != MouseEvent.BUTTON1) + if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || mouseDownButton != MouseEvent.BUTTON1) return; @@ -396,14 +399,15 @@ // primitives under cursor are stored in c collection - Collection c = MapView.asColl( - mv.getNearestNodeOrWay(e.getPoint(), OsmPrimitive.isSelectablePredicate, true)); - - determineMapMode(!c.isEmpty()); + + OsmPrimitive nearestPrimitive = mv.getNearestNodeOrWay(e.getPoint(), OsmPrimitive.isSelectablePredicate, true); + + determineMapMode(nearestPrimitive!=null); switch(mode) { case rotate: case scale: + // if nothing was selected, select primitive under cursor for scaling or rotating if (getCurrentDataSet().getSelected().isEmpty()) { - getCurrentDataSet().setSelected(c); + getCurrentDataSet().setSelected(MapView.asColl(nearestPrimitive)); } @@ -414,12 +418,14 @@ break; case move: - if (!cancelDrawMode && c.iterator().next() instanceof Way) { + // also include case when some primitive is under cursor and no shift+ctrl / alt+ctrl is pressed + // so this is not movement, but selection on primitive under cursor + if (!cancelDrawMode && nearestPrimitive instanceof Way) { virtualManager.setupVirtual(e.getPoint()); } - - selectPrims(cycleManager.cycleSetup(c, e.getPoint()), false, false); + selectPrims(cycleManager.cycleSetup(nearestPrimitive, e.getPoint()), false, false); break; case select: default: + // start working with rectangle or lasso selectionManager.register(mv, lassoMode); selectionManager.mousePressed(e); @@ -453,10 +459,10 @@ if (!mv.isActiveLayerVisible()) return; - + // Swing sends random mouseDragged events when closing dialogs by double-clicking their top-left icon on Windows // Ignore such false events to prevent issues like #7078 if (mouseDownButton == MouseEvent.BUTTON1 && mouseReleaseTime > mouseDownTime) return; - + cancelDrawMode = true; if (mode == Mode.select) @@ -827,30 +833,39 @@ private boolean cyclePrims = false; private OsmPrimitive cycleStart = null; - + private boolean waitForMouseUpParameter; + private boolean multipleMatchesParameter; /** - * - * @param osm nearest primitive found by simple method - * @param e - * @return + * read preferences */ - private Collection cycleSetup(Collection single, Point p) { + private void init() { + waitForMouseUpParameter = Main.pref.getBoolean("mappaint.select.waits-for-mouse-up", false); + multipleMatchesParameter = Main.pref.getBoolean("selectaction.cycles.multiple.matches", false); + } + + /** + * Determine prmitive to be selected and build cycleList + * @param nearest primitive found by simple method + * @param p point where user clicked + * @return single-element collection with OsmPrimitive to be selected + */ + private Collection cycleSetup(OsmPrimitive nearest, Point p) { OsmPrimitive osm = null; - if (single != null && !single.isEmpty()) { - osm = single.iterator().next(); + if (nearest != null) { + osm = nearest; // Point p = e.getPoint(); - boolean waitForMouseUp = Main.pref.getBoolean("mappaint.select.waits-for-mouse-up", false); // updateKeyModifiers(e); // cycleSetup called only after updateModifiers ! - alt = alt || Main.pref.getBoolean("selectaction.cycles.multiple.matches", false); - - if (!alt) { + + if (!(alt || multipleMatchesParameter)) { + // no real cycling, just one element in cycle list cycleList = MapView.asColl(osm); - if (waitForMouseUp) { + if (waitForMouseUpParameter) { // prefer a selected nearest node or way, if possible osm = mv.getNearestNodeOrWay(p, OsmPrimitive.isSelectablePredicate, true); } } else { + // Alt + left mouse button pressed: we need to build cycle list cycleList = mv.getAllNearest(p, OsmPrimitive.isSelectablePredicate); @@ -858,4 +873,5 @@ cyclePrims = false; + // find first already selected element in cycle list OsmPrimitive old = osm; for (OsmPrimitive o : cycleList) { @@ -869,5 +885,5 @@ // special case: for cycle groups of 2, we can toggle to the // true nearest primitive on mousePressed right away - if (cycleList.size() == 2 && !waitForMouseUp) { + if (cycleList.size() == 2 && !waitForMouseUpParameter) { if (!(osm.equals(old) || osm.isNew() || ctrl)) { cyclePrims = false; @@ -891,62 +907,66 @@ * Modifies current selection state and returns the next element in a * selection cycle given by - * prims. - * - * @param prims the primitives that form the selection cycle - * @param mouse event + * cycleList field * @return the next element of cycle list - * prims. */ private Collection cyclePrims() { - Collection prims = cycleList; OsmPrimitive nxt = null; - if (prims.size() > 1) { -// updateKeyModifiers(e); // already called before ! - - DataSet ds = getCurrentDataSet(); - OsmPrimitive first = prims.iterator().next(), foundInDS = null; - nxt = first; - - for (Iterator i = prims.iterator(); i.hasNext();) { - if (cyclePrims && shift) { - if (!(nxt = i.next()).isSelected()) { - break; // take first primitive in prims list not in sel - } - } else { - if ((nxt = i.next()).isSelected()) { - foundInDS = nxt; - if (cyclePrims || ctrl) { - ds.clearSelection(foundInDS); - nxt = i.hasNext() ? i.next() : first; - } - break; // take next primitive in prims list - } + if (cycleList.size() <= 1) { + // no real cycling, just return one-element collection with nearest primitive in it + return cycleList; + } +// updateKeyModifiers(e); // already called before ! + + DataSet ds = getCurrentDataSet(); + OsmPrimitive first = cycleList.iterator().next(), foundInDS = null; + nxt = first; + + if (cyclePrims && shift) { + for (Iterator i = cycleList.iterator(); i.hasNext();) { + nxt = i.next(); + if (!nxt.isSelected()) { + break; // take first primitive in cycleList not in sel } } - - if (ctrl) { - // a member of prims was found in the current dataset selection - if (foundInDS != null) { - // mouse was moved to a different selection group w/ a previous sel - if (!prims.contains(cycleStart)) { - ds.clearSelection(prims); - cycleStart = foundInDS; - } else if (cycleStart.equals(nxt)) { - // loop detected, insert deselect step - ds.addSelected(nxt); + // if primitives 1,2,3 are under cursor, [Alt-press] [Shift-release] gives 1 -> 12 -> 123 + } else { + for (Iterator i = cycleList.iterator(); i.hasNext();) { + nxt = i.next(); + if (nxt.isSelected()) { + foundInDS = nxt; + // first selected primitive in cycleList is found + if (cyclePrims || ctrl) { + ds.clearSelection(foundInDS); // deselect it + nxt = i.hasNext() ? i.next() : first; + // return next one in cycle list (last->first) } - } else { - // setup for iterating a sel group again or a new, different one.. - nxt = (prims.contains(cycleStart)) ? cycleStart : first; - cycleStart = nxt; + break; // take next primitive in cycleList + } + } + } + + // if "no-alt-cycling" is enabled, Ctrl-Click arrives here. + if (ctrl) { + // a member of cycleList was found in the current dataset selection + if (foundInDS != null) { + // mouse was moved to a different selection group w/ a previous sel + if (!cycleList.contains(cycleStart)) { + ds.clearSelection(cycleList); + cycleStart = foundInDS; + } else if (cycleStart.equals(nxt)) { + // loop detected, insert deselect step + ds.addSelected(nxt); } } else { - cycleStart = null; + // setup for iterating a sel group again or a new, different one.. + nxt = (cycleList.contains(cycleStart)) ? cycleStart : first; + cycleStart = nxt; } - } - - // pass on prims, if it had less than 2 elements - return (nxt != null) ? MapView.asColl(nxt) : prims; + } else { + cycleStart = null; + } + // return one-element collection with one element to be selected (or added to selection) + return MapView.asColl(nxt); } } @@ -956,5 +976,15 @@ private Node virtualNode = null; private Collection virtualWays = new LinkedList(); - + private int nodeVirtualSize; + private int virtualSnapDistSq2; + private int virtualSpace; + + private void init() { + nodeVirtualSize = Main.pref.getInteger("mappaint.node.virtual-size", 8); + int virtualSnapDistSq = Main.pref.getInteger("mappaint.node.virtual-snap-distance", 8); + virtualSnapDistSq2 = virtualSnapDistSq*virtualSnapDistSq; + virtualSpace = Main.pref.getInteger("mappaint.node.virtual-space", 70); + } + /** * Calculate a virtual node if there is enough visual space to draw a @@ -969,9 +999,6 @@ */ private boolean setupVirtual(Point p) { - if (Main.pref.getInteger("mappaint.node.virtual-size", 8) > 0) { - int virtualSnapDistSq = Main.pref.getInteger("mappaint.node.virtual-snap-distance", 8); - int virtualSpace = Main.pref.getInteger("mappaint.node.virtual-space", 70); - virtualSnapDistSq *= virtualSnapDistSq; - + if (nodeVirtualSize > 0) { + Collection selVirtualWays = new LinkedList(); Pair vnp = null, wnp = new Pair(null, null); @@ -985,5 +1012,5 @@ if (WireframeMapRenderer.isLargeSegment(p1, p2, virtualSpace)) { Point2D pc = new Point2D.Double((p1.getX() + p2.getX()) / 2, (p1.getY() + p2.getY()) / 2); - if (p.distanceSq(pc) < virtualSnapDistSq) { + if (p.distanceSq(pc) < virtualSnapDistSq2) { // Check that only segments on top of each other get added to the // virtual ways list. Otherwise ways that coincidentally have their