Changeset 15 in josm for src/org/openstreetmap/josm/actions
- Timestamp:
- 2005-10-07T01:13:49+02:00 (19 years ago)
- Location:
- src/org/openstreetmap/josm/actions
- Files:
-
- 1 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
src/org/openstreetmap/josm/actions/OpenGpxAction.java
r12 r15 15 15 import org.openstreetmap.josm.data.osm.DataSet; 16 16 import org.openstreetmap.josm.gui.Main; 17 import org.openstreetmap.josm.gui.MapFrame;18 17 import org.openstreetmap.josm.io.GpxReader; 19 18 import org.openstreetmap.josm.io.DataReader.ConnectionException; … … 55 54 try { 56 55 DataSet dataSet = new GpxReader(new FileReader(gpxFile)).parse(); 57 MapFrame map = new MapFrame(dataSet); 58 Main.main.setMapFrame(gpxFile.getName(), map); 56 Main.main.setMapFrame(gpxFile.getName(), dataSet); 59 57 } catch (ParseException x) { 60 58 x.printStackTrace(); -
src/org/openstreetmap/josm/actions/SaveGpxAction.java
r11 r15 46 46 try { 47 47 FileWriter fileWriter = new FileWriter(gpxFile); 48 GpxWriter out = new GpxWriter(fileWriter, Main.main.getMapFrame(). mapView.dataSet);48 GpxWriter out = new GpxWriter(fileWriter, Main.main.getMapFrame().layer.dataSet); 49 49 out.output(); 50 50 fileWriter.close(); -
src/org/openstreetmap/josm/actions/mapmode/AddLineSegmentAction.java
r8 r15 59 59 public void registerListener() { 60 60 super.registerListener(); 61 mv.addMouseListener(this);62 mv.addMouseMotionListener(this);61 layer.addMouseListener(this); 62 layer.addMouseMotionListener(this); 63 63 } 64 64 … … 66 66 public void unregisterListener() { 67 67 super.unregisterListener(); 68 mv.removeMouseListener(this);69 mv.removeMouseMotionListener(this);68 layer.removeMouseListener(this); 69 layer.removeMouseMotionListener(this); 70 70 drawHint(false); 71 71 } … … 79 79 return; 80 80 81 OsmPrimitive clicked = mv.getNearest(e.getPoint(), false);81 OsmPrimitive clicked = layer.getNearest(e.getPoint(), false); 82 82 if (clicked == null || !(clicked instanceof Node)) 83 83 return; … … 96 96 return; 97 97 98 OsmPrimitive clicked = mv.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0);98 OsmPrimitive clicked = layer.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0); 99 99 if (clicked == null || clicked == second || !(clicked instanceof Node)) 100 100 return; … … 161 161 } 162 162 163 mv.repaint();163 layer.repaint(); 164 164 } 165 165 … … 175 175 return; 176 176 177 Graphics g = mv.getGraphics();177 Graphics g = layer.getGraphics(); 178 178 g.setColor(Color.BLACK); 179 179 g.setXORMode(Color.WHITE); 180 Point firstDrawn = mv.getScreenPoint(first.coor);181 Point secondDrawn = mv.getScreenPoint(second.coor);180 Point firstDrawn = layer.getScreenPoint(first.coor); 181 Point secondDrawn = layer.getScreenPoint(second.coor); 182 182 g.drawLine(firstDrawn.x, firstDrawn.y, secondDrawn.x, secondDrawn.y); 183 183 hintDrawn = !hintDrawn; -
src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java
r7 r15 30 30 public void registerListener() { 31 31 super.registerListener(); 32 mv.addMouseListener(this);32 layer.addMouseListener(this); 33 33 } 34 34 … … 36 36 public void unregisterListener() { 37 37 super.unregisterListener(); 38 mv.removeMouseListener(this);38 layer.removeMouseListener(this); 39 39 } 40 40 … … 47 47 if (e.getButton() == MouseEvent.BUTTON1) { 48 48 Node node = new Node(); 49 node.coor = mv.getPoint(e.getX(), e.getY(), true);49 node.coor = layer.getPoint(e.getX(), e.getY(), true); 50 50 ds.nodes.add(node); 51 mv.repaint();51 layer.repaint(); 52 52 } 53 53 } -
src/org/openstreetmap/josm/actions/mapmode/AddTrackAction.java
r8 r15 43 43 public AddTrackAction(MapFrame mapFrame) { 44 44 super("Add Track", "addtrack", "Combine line segments to a new track.", KeyEvent.VK_T, mapFrame); 45 this.selectionManager = new SelectionManager(this, false, mv);45 this.selectionManager = new SelectionManager(this, false, layer); 46 46 } 47 47 … … 49 49 public void registerListener() { 50 50 super.registerListener(); 51 selectionManager.register( mv);51 selectionManager.register(layer); 52 52 } 53 53 … … 55 55 public void unregisterListener() { 56 56 super.unregisterListener(); 57 selectionManager.unregister( mv);57 selectionManager.unregister(layer); 58 58 } 59 59 … … 82 82 osm.setSelected(!ctrl, ds); 83 83 84 mv.repaint(); // from now on, the map has to be repainted.84 layer.repaint(); // from now on, the map has to be repainted. 85 85 86 86 if (ctrl || shift) -
src/org/openstreetmap/josm/actions/mapmode/CombineAction.java
r8 r15 80 80 public void registerListener() { 81 81 super.registerListener(); 82 mv.addMouseListener(this);83 mv.addMouseMotionListener(this);82 layer.addMouseListener(this); 83 layer.addMouseMotionListener(this); 84 84 ds.clearSelection(); 85 85 } … … 88 88 public void unregisterListener() { 89 89 super.unregisterListener(); 90 mv.removeMouseListener(this);91 mv.removeMouseMotionListener(this);90 layer.removeMouseListener(this); 91 layer.removeMouseMotionListener(this); 92 92 drawCombineHint(false); 93 93 } … … 103 103 return; 104 104 105 OsmPrimitive clicked = mv.getNearest(e.getPoint(), true);105 OsmPrimitive clicked = layer.getNearest(e.getPoint(), true); 106 106 if (clicked == null || clicked instanceof Node) 107 107 return; … … 119 119 return; 120 120 121 OsmPrimitive clicked = mv.getNearest(e.getPoint(), true);121 OsmPrimitive clicked = layer.getNearest(e.getPoint(), true); 122 122 if (clicked == null || clicked == second || clicked instanceof Node) 123 123 return; … … 168 168 } 169 169 } 170 mv.repaint();170 layer.repaint(); 171 171 } 172 172 … … 198 198 return; 199 199 200 Graphics g = mv.getGraphics();200 Graphics g = layer.getGraphics(); 201 201 g.setColor(Color.BLACK); 202 202 g.setXORMode(Color.WHITE); … … 214 214 if (osm instanceof LineSegment) { 215 215 LineSegment ls = (LineSegment)osm; 216 Point start = mv.getScreenPoint(ls.getStart().coor);217 Point end = mv.getScreenPoint(ls.getEnd().coor);218 if ( mv.dataSet.pendingLineSegments().contains(osm) && g.getColor() == Color.GRAY)216 Point start = layer.getScreenPoint(ls.getStart().coor); 217 Point end = layer.getScreenPoint(ls.getEnd().coor); 218 if (layer.dataSet.pendingLineSegments().contains(osm) && g.getColor() == Color.GRAY) 219 219 g.drawLine(start.x, start.y, end.x, end.y); 220 220 else -
src/org/openstreetmap/josm/actions/mapmode/DebugAction.java
r8 r15 31 31 public void registerListener() { 32 32 super.registerListener(); 33 mv.addMouseMotionListener(this);34 mv.addMouseListener(this);33 layer.addMouseMotionListener(this); 34 layer.addMouseListener(this); 35 35 mapFrame.add(label, BorderLayout.SOUTH); 36 36 } … … 39 39 public void unregisterListener() { 40 40 super.unregisterListener(); 41 mv.removeMouseMotionListener(this);42 mv.removeMouseListener(this);41 layer.removeMouseMotionListener(this); 42 layer.removeMouseListener(this); 43 43 mapFrame.remove(label); 44 44 } … … 46 46 @Override 47 47 public void mouseClicked(MouseEvent e) { 48 Graphics g = mapFrame. mapView.getGraphics();48 Graphics g = mapFrame.layer.getGraphics(); 49 49 g.setColor(Color.WHITE); 50 for (Track t :mapFrame. mapView.dataSet.tracks())50 for (Track t :mapFrame.layer.dataSet.tracks()) 51 51 for (LineSegment ls : t.segments()) { 52 Point A = mapFrame. mapView.getScreenPoint(ls.getStart().coor);53 Point B = mapFrame. mapView.getScreenPoint(ls.getEnd().coor);52 Point A = mapFrame.layer.getScreenPoint(ls.getStart().coor); 53 Point B = mapFrame.layer.getScreenPoint(ls.getEnd().coor); 54 54 Point C = e.getPoint(); 55 55 Rectangle r = new Rectangle(A.x, A.y, B.x-A.x, B.y-A.y); -
src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
r8 r15 71 71 public void registerListener() { 72 72 super.registerListener(); 73 mv.addMouseListener(this);73 layer.addMouseListener(this); 74 74 } 75 75 … … 77 77 public void unregisterListener() { 78 78 super.unregisterListener(); 79 mv.removeMouseListener(this);79 layer.removeMouseListener(this); 80 80 } 81 81 … … 89 89 return; 90 90 91 OsmPrimitive sel = mv.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0);91 OsmPrimitive sel = layer.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0); 92 92 if (sel == null) 93 93 return; … … 98 98 delete(sel); 99 99 100 mv.repaint();100 layer.repaint(); 101 101 } 102 102 -
src/org/openstreetmap/josm/actions/mapmode/MapMode.java
r11 r15 14 14 import org.openstreetmap.josm.gui.Main; 15 15 import org.openstreetmap.josm.gui.MapFrame; 16 import org.openstreetmap.josm.gui. MapView;16 import org.openstreetmap.josm.gui.Layer; 17 17 18 18 /** … … 31 31 protected final MapFrame mapFrame; 32 32 /** 33 * Shortcut to the MapView.33 * Shortcut to the Layer. 34 34 */ 35 protected final MapView mv;35 protected final Layer layer; 36 36 /** 37 37 * Shortcut to the DataSet. … … 53 53 mapFrame.getActionMap().put(this, this); 54 54 this.mapFrame = mapFrame; 55 mv = mapFrame.mapView;56 ds = mv.dataSet;55 layer = mapFrame.layer; 56 ds = layer.dataSet; 57 57 } 58 58 59 59 /** 60 * Register all listener to the mapView 61 * @param mapView The view, where the listener should be registered. 60 * Register all listener to the layer 62 61 */ 63 62 public void registerListener() { … … 67 66 /** 68 67 * Unregister all listener previously registered. 69 * @param mapView The view from which the listener should be deregistered.70 68 */ 71 69 public void unregisterListener() { -
src/org/openstreetmap/josm/actions/mapmode/MoveAction.java
r8 r15 48 48 public void registerListener() { 49 49 super.registerListener(); 50 mv.addMouseListener(this);51 mv.addMouseMotionListener(this);50 layer.addMouseListener(this); 51 layer.addMouseMotionListener(this); 52 52 } 53 53 … … 55 55 public void unregisterListener() { 56 56 super.unregisterListener(); 57 mv.removeMouseListener(this);58 mv.removeMouseMotionListener(this);57 layer.removeMouseListener(this); 58 layer.removeMouseMotionListener(this); 59 59 } 60 60 … … 86 86 87 87 for (Node n : movingNodes) { 88 Point pos = mv.getScreenPoint(n.coor);88 Point pos = layer.getScreenPoint(n.coor); 89 89 pos.x += dx; 90 90 pos.y += dy; 91 n.coor = mv.getPoint(pos.x, pos.y, true);91 n.coor = layer.getPoint(pos.x, pos.y, true); 92 92 } 93 mv.repaint();93 layer.repaint(); 94 94 95 95 mousePos = e.getPoint(); … … 111 111 112 112 if (ds.getSelected().size() == 0) { 113 OsmPrimitive osm = mv.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0);113 OsmPrimitive osm = layer.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0); 114 114 if (osm != null) 115 115 osm.setSelected(true, ds); 116 116 singleOsmPrimitive = osm; 117 mv.repaint();117 layer.repaint(); 118 118 } else 119 119 singleOsmPrimitive = null; 120 120 121 121 mousePos = e.getPoint(); 122 oldCursor = mv.getCursor();123 mv.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));122 oldCursor = layer.getCursor(); 123 layer.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); 124 124 } 125 125 … … 129 129 @Override 130 130 public void mouseReleased(MouseEvent e) { 131 mv.setCursor(oldCursor);131 layer.setCursor(oldCursor); 132 132 if (singleOsmPrimitive != null) { 133 133 singleOsmPrimitive.setSelected(false, ds); 134 mv.repaint();134 layer.repaint(); 135 135 } 136 136 } -
src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java
r8 r15 46 46 * and the user clicked in or 10 pixel away from an area, this area is selected. 47 47 * If there is even no area, nothing is selected. Shift and Ctrl key applies to 48 * this as usual. For more, @see MapView#getNearest(Point, boolean)48 * this as usual. For more, @see Layer#getNearest(Point, boolean) 49 49 * 50 50 * @author imi … … 63 63 public SelectionAction(MapFrame mapFrame) { 64 64 super("Selection", "selection", "Select objects by dragging or clicking", KeyEvent.VK_S, mapFrame); 65 this.selectionManager = new SelectionManager(this, false, mv);65 this.selectionManager = new SelectionManager(this, false, layer); 66 66 } 67 67 … … 69 69 public void registerListener() { 70 70 super.registerListener(); 71 selectionManager.register( mv);71 selectionManager.register(layer); 72 72 } 73 73 … … 75 75 public void unregisterListener() { 76 76 super.unregisterListener(); 77 selectionManager.unregister( mv);77 selectionManager.unregister(layer); 78 78 } 79 79 … … 92 92 for (OsmPrimitive osm : selectionList) 93 93 osm.setSelected(!ctrl, ds); 94 mv.repaint();94 layer.repaint(); 95 95 } 96 96 } -
src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java
r7 r15 6 6 import org.openstreetmap.josm.data.GeoPoint; 7 7 import org.openstreetmap.josm.gui.MapFrame; 8 import org.openstreetmap.josm.gui. MapView;8 import org.openstreetmap.josm.gui.Layer; 9 9 import org.openstreetmap.josm.gui.SelectionManager; 10 10 import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded; … … 14 14 * 15 15 * Holding down the left mouse button select a rectangle with the same aspect 16 * ratio than the current map view.16 * ratio than the current layer. 17 17 * Holding down left and right let the user move the former selected rectangle. 18 18 * Releasing the left button zoom to the selection. … … 28 28 * Shortcut to the mapview. 29 29 */ 30 private final MapViewmv;30 private final Layer mv; 31 31 /** 32 32 * Manager that manages the selection rectangle with the aspect ratio of the 33 * MapView.33 * Layer. 34 34 */ 35 35 private final SelectionManager selectionManager; … … 42 42 public ZoomAction(MapFrame mapFrame) { 43 43 super("Zoom", "zoom", "Zoom in by dragging", KeyEvent.VK_Z, mapFrame); 44 mv = mapFrame. mapView;44 mv = mapFrame.layer; 45 45 selectionManager = new SelectionManager(this, true, mv); 46 46 }
Note:
See TracChangeset
for help on using the changeset viewer.