Changeset 5152 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
- Timestamp:
- 2012-04-01T19:11:26+02:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r5093 r5152 84 84 rotate("rotate", null), 85 85 merge("crosshair", null), 86 lasso("normal", "rope"), 86 87 merge_to_node("crosshair", "joinnode"), 87 88 move(Cursor.MOVE_CURSOR); … … 98 99 } 99 100 } 101 102 private boolean lassoMode = false; 100 103 101 104 // Cache previous mouse event (needed when only the modifier keys are … … 172 175 mv.addMouseListener(this); 173 176 mv.addMouseMotionListener(this); 174 mv.setVirtualNodesEnabled( 175 Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0); 177 mv.setVirtualNodesEnabled(Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0); 176 178 drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true); 177 179 // This is required to update the cursors when ctrl/shift/alt is pressed … … 241 243 break; 242 244 case select: 243 c = "rect" + (shift ? "_add" : (ctrl ? "_rm" : "")); 245 if (lassoMode) { 246 c = "lasso"; 247 } else { 248 c = "rect" + (shift ? "_add" : (ctrl ? "_rm" : "")); 249 } 244 250 break; 245 251 } … … 727 733 case select: 728 734 default: 729 selectionManager.register(mv );735 selectionManager.register(mv, lassoMode); 730 736 selectionManager.mousePressed(e); 731 737 break; … … 825 831 public void selectionEnded(Rectangle r, MouseEvent e) { 826 832 updateKeyModifiers(e); 827 selectPrims(selectionManager.getObjectsInRectangle(r, alt), e, true, true); 833 mv.repaint(); 834 selectPrims(selectionManager.getSelectedObjects(alt), e, true, true); 828 835 } 829 836 … … 974 981 return l instanceof OsmDataLayer; 975 982 } 983 984 public void setLassoMode(boolean lassoMode) { 985 System.out.println(lassoMode); 986 this.selectionManager.setLassoMode(lassoMode); 987 this.lassoMode = lassoMode; 988 } 976 989 }
Note:
See TracChangeset
for help on using the changeset viewer.