Changeset 12725 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
- Timestamp:
- 2017-09-04T20:19:23+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
r12630 r12725 85 85 @Override 86 86 public boolean containsPoint(Point p) { 87 Point screen = MainApplication.getMap().mapView.getPoint( getEastNorth());87 Point screen = MainApplication.getMap().mapView.getPoint(this); 88 88 Rectangle r = new Rectangle(screen.x, screen.y, symbol.getIconWidth(), 89 89 symbol.getIconHeight()); … … 214 214 for (Marker m : recent.parentLayer.data) { 215 215 if (m instanceof AudioMarker) { 216 double distanceSquared = m.getEastNorth( ).distanceSq(en);216 double distanceSquared = m.getEastNorth(Main.getProjection()).distanceSq(en); 217 217 if (distanceSquared < closestAudioMarkerDistanceSquared) { 218 218 ca = (AudioMarker) m; … … 283 283 public void paint(Graphics g, MapView mv) { 284 284 if (time < 0.0) return; 285 Point screen = mv.getPoint( getEastNorth());285 Point screen = mv.getPoint(this); 286 286 paintIcon(mv, g, screen.x, screen.y); 287 287 } … … 347 347 return; 348 348 setEastNorth(w2 == null ? 349 w1.getEastNorth( ) :350 w1.getEastNorth( ).interpolate(w2.getEastNorth(),349 w1.getEastNorth(Main.getProjection()) : 350 w1.getEastNorth(Main.getProjection()).interpolate(w2.getEastNorth(Main.getProjection()), 351 351 (audioTime - w1.time)/(w2.time - w1.time))); 352 352 time = audioTime; … … 354 354 if (jumpToMarker) { 355 355 jumpToMarker = false; 356 mapView.zoomTo(w1 .getEastNorth());356 mapView.zoomTo(w1); 357 357 } 358 358 mapView.repaint();
Note:
See TracChangeset
for help on using the changeset viewer.