Changeset 582 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer
- Timestamp:
- 2008-03-15T14:39:28+01:00 (16 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
r572 r582 2 2 package org.openstreetmap.josm.gui.layer.markerlayer; 3 3 4 import static org.openstreetmap.josm.tools.I18n.tr;5 6 import java.awt.Graphics;7 import java.awt.Point;8 import java.awt.Rectangle;9 4 import java.awt.event.ActionEvent; 10 import java.awt.event.ActionListener;11 import java.io.IOException;12 5 import java.net.URL; 13 14 import javax.swing.Icon;15 import javax.swing.JOptionPane;16 import javax.swing.Timer;17 6 18 7 import org.openstreetmap.josm.Main; 19 8 import org.openstreetmap.josm.data.coor.LatLon; 20 9 import org.openstreetmap.josm.tools.AudioPlayer; 21 import org.openstreetmap.josm.data.gpx.WayPoint;22 import org.openstreetmap.josm.data.coor.EastNorth;23 import org.openstreetmap.josm.gui.MapView;24 25 import org.openstreetmap.josm.tools.ImageProvider;26 10 27 11 /** -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
r562 r582 14 14 import org.openstreetmap.josm.data.coor.LatLon; 15 15 import org.openstreetmap.josm.gui.MapView; 16 import org.openstreetmap.josm.gui.layer.Layer;17 16 18 17 /** -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
r553 r582 22 22 import org.openstreetmap.josm.data.coor.LatLon; 23 23 import org.openstreetmap.josm.tools.ImageProvider; 24 import org.openstreetmap.josm.gui.layer.Layer;25 24 26 25 /** -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
r576 r582 10 10 import java.net.URL; 11 11 import java.util.Collection; 12 import java.util.HashMap;13 12 import java.util.LinkedList; 14 import java.util.Map;15 13 16 14 import javax.swing.Icon; … … 22 20 import org.openstreetmap.josm.data.gpx.WayPoint; 23 21 import org.openstreetmap.josm.gui.MapView; 24 import org.openstreetmap.josm.gui.layer.Layer;25 22 import org.openstreetmap.josm.tools.ImageProvider; 26 23 … … 80 77 static { 81 78 Marker.markerProducers.add(new MarkerProducers() { 82 public Marker createMarker(WayPoint wpt, File relativePath) {83 return createMarker(wpt, relativePath, null, 0.0, 0.0);84 }85 86 79 public Marker createMarker(WayPoint wpt, File relativePath, MarkerLayer parentLayer, double time, double offset) { 87 80 String uri = null; … … 93 86 break; 94 87 } 95 } catch (Exception ex) {} ;88 } catch (Exception ex) {} 96 89 97 90 // Try a relative file:// url, if the link is not in an URL-compatible form -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r572 r582 9 9 import java.awt.Graphics; 10 10 import java.awt.Point; 11 import java.awt.Rectangle;12 11 import java.awt.event.ActionEvent; 13 12 import java.awt.event.ActionListener; … … 15 14 import java.awt.event.MouseEvent; 16 15 import java.io.File; 16 import java.net.URL; 17 17 import java.util.ArrayList; 18 18 import java.util.Collection; 19 import java.util.Iterator;20 import java.net.URL;21 19 22 20 import javax.swing.Icon; 23 21 import javax.swing.JColorChooser; 24 import javax.swing.JFileChooser;25 22 import javax.swing.JMenuItem; 26 23 import javax.swing.JOptionPane; 27 24 import javax.swing.JSeparator; 28 25 import javax.swing.SwingUtilities; 29 import javax.swing.Timer;30 import javax.swing.filechooser.FileFilter;31 26 32 27 import org.openstreetmap.josm.Main; 33 28 import org.openstreetmap.josm.actions.RenameLayerAction; 34 import org.openstreetmap.josm.command.Command;35 29 import org.openstreetmap.josm.data.coor.EastNorth; 36 30 import org.openstreetmap.josm.data.gpx.GpxData; 37 import org.openstreetmap.josm.data.gpx.GpxTrack;38 31 import org.openstreetmap.josm.data.gpx.WayPoint; 39 32 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; … … 41 34 import org.openstreetmap.josm.gui.dialogs.LayerListDialog; 42 35 import org.openstreetmap.josm.gui.dialogs.LayerListPopup; 36 import org.openstreetmap.josm.gui.layer.GpxLayer; 43 37 import org.openstreetmap.josm.gui.layer.Layer; 44 import org.openstreetmap.josm.gui.layer.GpxLayer; 45 import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker; 46 import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker; 38 import org.openstreetmap.josm.tools.AudioPlayer; 47 39 import org.openstreetmap.josm.tools.ColorHelper; 48 40 import org.openstreetmap.josm.tools.ImageProvider; 49 import org.openstreetmap.josm.tools.AudioPlayer;50 41 51 42 /** … … 369 360 } 370 361 Marker previousMarker = null; 371 Marker targetMarker = null;372 362 boolean nextTime = false; 373 363 if (Main.map == null || Main.map.mapView == null) -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java
r553 r582 3 3 4 4 import java.io.File; 5 import java.util.Map;6 5 7 import org.openstreetmap.josm.data.coor.LatLon;8 6 import org.openstreetmap.josm.data.gpx.WayPoint; 9 import org.openstreetmap.josm.gui.layer.Layer;10 7 11 8 /** -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
r577 r582 3 3 import static org.openstreetmap.josm.tools.I18n.tr; 4 4 5 import java.awt.Cursor;6 5 import java.awt.Graphics; 7 import java.awt.Insets;8 6 import java.awt.Point; 9 7 import java.awt.Rectangle; … … 11 9 import java.awt.event.ActionListener; 12 10 import java.awt.event.MouseAdapter; 13 import java.awt.event.MouseListener;14 import java.awt.event.MouseMotionAdapter;15 11 import java.awt.event.MouseEvent; 16 import java.awt.event.MouseMotionListener;17 import java.io.IOException;18 import java.net.URL;19 12 import java.util.Collection; 20 13 import java.util.Iterator; 21 14 22 import javax.swing.BorderFactory;23 import javax.swing.Icon;24 15 import javax.swing.JOptionPane; 25 16 import javax.swing.Timer; 26 import javax.swing.border.BevelBorder;27 import javax.swing.border.Border;28 17 29 18 import org.openstreetmap.josm.Main; 30 19 import org.openstreetmap.josm.actions.mapmode.MapMode; 31 20 import org.openstreetmap.josm.actions.mapmode.PlayHeadDragMode; 21 import org.openstreetmap.josm.data.coor.EastNorth; 32 22 import org.openstreetmap.josm.data.coor.LatLon; 33 import org.openstreetmap.josm.tools.AudioPlayer;34 23 import org.openstreetmap.josm.data.gpx.GpxTrack; 35 24 import org.openstreetmap.josm.data.gpx.WayPoint; 36 import org.openstreetmap.josm.data.coor.EastNorth;37 25 import org.openstreetmap.josm.gui.MapView; 38 26 import org.openstreetmap.josm.gui.layer.GpxLayer; 39 40 import org.openstreetmap.josm.tools.ImageProvider; 27 import org.openstreetmap.josm.tools.AudioPlayer; 41 28 42 29 /** … … 144 131 * @param pixelTolerance : only accept the point if within this number of pixels of en 145 132 * @return the nearest trackpoint or null if nothing nearby 146 */ 133 * 134 * XXX seems unused, F.R. 2008-03-15 147 135 private WayPoint getClosestTrackPoint(Point pNear, double pixelTolerance) { 148 136 WayPoint cw = null; 149 137 AudioMarker recentlyPlayedMarker = AudioMarker.recentlyPlayedMarker(); 150 138 if (recentlyPlayedMarker != null) { 151 / * Find the track point closest to letting go of the play head */139 // Find the track point closest to letting go of the play head 152 140 double minDistance = pixelTolerance; 153 141 GpxLayer trackLayer = recentlyPlayedMarker.parentLayer.fromLayer; 154 if (trackLayer.data.tracks != null) { 155 for (GpxTrack track : trackLayer.data.tracks) { 156 if (track.trackSegs != null) { 157 for (Collection<WayPoint> trackseg : track.trackSegs) { 158 for (Iterator<WayPoint> it = trackseg.iterator(); it.hasNext();) { 159 WayPoint w = it.next(); 160 Point p = Main.map.mapView.getPoint(w.eastNorth); 161 double distance = p.distance(pNear); 162 if (distance <= minDistance) { 163 cw = w; 164 minDistance = distance; 165 } 166 } 142 if (trackLayer.data.tracks == null) 143 return null; 144 145 for (GpxTrack track : trackLayer.data.tracks) { 146 if (track.trackSegs == null) 147 continue; 148 149 for (Collection<WayPoint> trackseg : track.trackSegs) { 150 for (WayPoint w : trackseg) { 151 Point p = Main.map.mapView.getPoint(w.eastNorth); 152 double distance = p.distance(pNear); 153 if (distance <= minDistance) { 154 cw = w; 155 minDistance = distance; 167 156 } 168 157 } … … 172 161 return cw; 173 162 } 163 */ 174 164 175 165 /** -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
r553 r582 12 12 import org.openstreetmap.josm.data.coor.LatLon; 13 13 import org.openstreetmap.josm.tools.OpenBrowser; 14 import org.openstreetmap.josm.gui.layer.Layer;15 14 16 15 /**
Note:
See TracChangeset
for help on using the changeset viewer.