Changeset 11621 in josm for trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
- Timestamp:
- 2017-02-25T21:21:27+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
r11452 r11621 277 277 } 278 278 279 /* we must have got at least one waypoint now */ 280 279 // we must have got at least one waypoint now 281 280 ((ArrayList<WayPoint>) waypoints).sort(Comparator.comparingDouble(o -> o.time)); 282 281 283 firstTime = -1.0; / * this time of the first waypoint, not first trackpoint */282 firstTime = -1.0; // this time of the first waypoint, not first trackpoint 284 283 for (WayPoint w : waypoints) { 285 284 if (firstTime < 0.0) { … … 288 287 double offset = w.time - firstTime; 289 288 AudioMarker am = new AudioMarker(w.getCoor(), w, url, ml, w.time, offset); 290 /* 291 * timeFromAudio intended for future use to shift markers of this type on synchronization 292 */ 289 // timeFromAudio intended for future use to shift markers of this type on synchronization 293 290 if (w == wayPointFromTimeStamp) { 294 291 am.timeFromAudio = true; … … 298 295 299 296 if (timedMarkersOmitted && !markers.timedMarkersOmitted) { 300 JOptionPane 301 .showMessageDialog( 302 Main.parent, 303 // CHECKSTYLE.OFF: LineLength 304 tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start.")); 305 // CHECKSTYLE.ON: LineLength 297 JOptionPane.showMessageDialog(Main.parent, 298 tr("Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start.")); 306 299 markers.timedMarkersOmitted = timedMarkersOmitted; 307 300 } 308 301 if (untimedMarkersOmitted && !markers.untimedMarkersOmitted) { 309 JOptionPane 310 .showMessageDialog( 311 Main.parent, 312 tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted.")); 302 JOptionPane.showMessageDialog(Main.parent, 303 tr("Some waypoints which were too far from the track to sensibly estimate their time were omitted.")); 313 304 markers.untimedMarkersOmitted = untimedMarkersOmitted; 314 305 }
Note:
See TracChangeset
for help on using the changeset viewer.