import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.EtchedBorder;
+
+import tim.prune.Config;
import tim.prune.DataSubscriber;
import tim.prune.I18nManager;
import tim.prune.data.Altitude;
private JLabel _indexLabel = null;
private JLabel _latLabel = null, _longLabel = null;
private JLabel _altLabel = null, _nameLabel = null;
- private JLabel _timeLabel = null;
+ private JLabel _timeLabel = null, _speedLabel = null;
// Range details
private JLabel _rangeLabel = null;
- private JLabel _distanceLabel = null, _durationLabel = null;
+ private JLabel _distanceLabel = null, _movingDistanceLabel = null;
+ private JLabel _durationLabel = null;
private JLabel _altRangeLabel = null, _updownLabel = null;
+ private JLabel _aveSpeedLabel = null, _aveMovingSpeedLabel = null;
// Photo details
private JLabel _photoLabel = null;
private PhotoThumbnail _photoThumbnail = null;
+ private JLabel _photoTimestampLabel = null;
private JLabel _photoConnectedLabel = null;
// Units
private NumberFormat _distanceFormatter = NumberFormat.getInstance();
// Cached labels
- private static final String LABEL_POINT_SELECTED1 = I18nManager.getText("details.index.selected") + ": ";
+ private static final String LABEL_POINT_SELECTED = I18nManager.getText("details.index.selected") + ": ";
private static final String LABEL_POINT_LATITUDE = I18nManager.getText("fieldname.latitude") + ": ";
private static final String LABEL_POINT_LONGITUDE = I18nManager.getText("fieldname.longitude") + ": ";
private static final String LABEL_POINT_ALTITUDE = I18nManager.getText("fieldname.altitude") + ": ";
private static final String LABEL_POINT_TIMESTAMP = I18nManager.getText("fieldname.timestamp") + ": ";
private static final String LABEL_POINT_WAYPOINTNAME = I18nManager.getText("fieldname.waypointname") + ": ";
- private static final String LABEL_RANGE_SELECTED1 = I18nManager.getText("details.range.selected") + ": ";
+ private static final String LABEL_RANGE_SELECTED = I18nManager.getText("details.range.selected") + ": ";
private static final String LABEL_RANGE_DURATION = I18nManager.getText("fieldname.duration") + ": ";
private static final String LABEL_RANGE_DISTANCE = I18nManager.getText("fieldname.distance") + ": ";
+ private static final String LABEL_RANGE_MOVINGDISTANCE = I18nManager.getText("fieldname.movingdistance") + ": ";
private static final String LABEL_RANGE_ALTITUDE = I18nManager.getText("fieldname.altitude") + ": ";
private static final String LABEL_RANGE_CLIMB = I18nManager.getText("details.range.climb") + ": ";
private static final String LABEL_RANGE_DESCENT = ", " + I18nManager.getText("details.range.descent") + ": ";
pointDetailsPanel.add(_altLabel);
_timeLabel = new JLabel("");
pointDetailsPanel.add(_timeLabel);
+ _speedLabel = new JLabel("");
+ pointDetailsPanel.add(_speedLabel);
_nameLabel = new JLabel("");
pointDetailsPanel.add(_nameLabel);
pointDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
rangeDetailsPanel.add(_rangeLabel);
_distanceLabel = new JLabel("");
rangeDetailsPanel.add(_distanceLabel);
+ _movingDistanceLabel = new JLabel("");
+ rangeDetailsPanel.add(_movingDistanceLabel);
_durationLabel = new JLabel("");
rangeDetailsPanel.add(_durationLabel);
+ _aveSpeedLabel = new JLabel("");
+ rangeDetailsPanel.add(_aveSpeedLabel);
+ _aveMovingSpeedLabel = new JLabel("");
+ rangeDetailsPanel.add(_aveMovingSpeedLabel);
_altRangeLabel = new JLabel("");
rangeDetailsPanel.add(_altRangeLabel);
_updownLabel = new JLabel("");
rangeDetailsPanel.add(_updownLabel);
rangeDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
- // range details panel
+ // photo details panel
JPanel photoDetailsPanel = new JPanel();
photoDetailsPanel.setLayout(new BoxLayout(photoDetailsPanel, BoxLayout.Y_AXIS));
photoDetailsPanel.setBorder(BorderFactory.createCompoundBorder(
photoDetailsPanel.add(photoDetailsLabel);
_photoLabel = new JLabel(I18nManager.getText("details.nophoto"));
photoDetailsPanel.add(_photoLabel);
+ _photoTimestampLabel = new JLabel("");
+ photoDetailsPanel.add(_photoTimestampLabel);
_photoConnectedLabel = new JLabel("");
photoDetailsPanel.add(_photoConnectedLabel);
_photoThumbnail = new PhotoThumbnail();
lowerPanel.add(unitsLabel);
String[] distUnits = {I18nManager.getText("units.kilometres"), I18nManager.getText("units.miles")};
_distUnitsDropdown = new JComboBox(distUnits);
+ if (!Config.getUseMetricUnits()) {_distUnitsDropdown.setSelectedIndex(1);}
_distUnitsDropdown.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e)
{
DataPoint currentPoint = _trackInfo.getCurrentPoint();
Selection selection = _trackInfo.getSelection();
int currentPointIndex = selection.getCurrentPointIndex();
+ _speedLabel.setText("");
+ int distUnits = _distUnitsDropdown.getSelectedIndex()==0?Distance.UNITS_KILOMETRES:Distance.UNITS_MILES;
+ String distUnitsStr = I18nManager.getText(_distUnitsDropdown.getSelectedIndex()==0?"units.kilometres.short":"units.miles.short");
+ String speedUnitsStr = I18nManager.getText(_distUnitsDropdown.getSelectedIndex()==0?"units.kmh":"units.mph");
if (_track == null || currentPoint == null)
{
_indexLabel.setText(I18nManager.getText("details.nopointselection"));
}
else
{
- _indexLabel.setText(LABEL_POINT_SELECTED1
+ _indexLabel.setText(LABEL_POINT_SELECTED
+ (currentPointIndex+1) + " " + I18nManager.getText("details.index.of")
+ " " + _track.getNumPoints());
_latLabel.setText(makeCoordinateLabel(LABEL_POINT_LATITUDE, currentPoint.getLatitude(), _coordFormatDropdown.getSelectedIndex()));
_longLabel.setText(makeCoordinateLabel(LABEL_POINT_LONGITUDE, currentPoint.getLongitude(), _coordFormatDropdown.getSelectedIndex()));
- _altLabel.setText(LABEL_POINT_ALTITUDE
- + (currentPoint.hasAltitude()?
- (currentPoint.getAltitude().getValue() + getAltitudeUnitsLabel(currentPoint.getAltitude().getFormat())):
- ""));
+ _altLabel.setText(currentPoint.hasAltitude()?
+ (LABEL_POINT_ALTITUDE + currentPoint.getAltitude().getValue() + getAltitudeUnitsLabel(currentPoint.getAltitude().getFormat()))
+ :"");
if (currentPoint.getTimestamp().isValid())
+ {
+ if (currentPointIndex > 0 && currentPointIndex < (_trackInfo.getTrack().getNumPoints()-1)) {
+ DataPoint prevPoint = _trackInfo.getTrack().getPoint(currentPointIndex - 1);
+ DataPoint nextPoint = _trackInfo.getTrack().getPoint(currentPointIndex + 1);
+ if (prevPoint.getTimestamp().isValid() && nextPoint.getTimestamp().isValid())
+ {
+ // use total distance and total time between neighbouring points
+ long diff = nextPoint.getTimestamp().getSecondsSince(prevPoint.getTimestamp());
+ if (diff < 1000) {
+ double rads = DataPoint.calculateRadiansBetween(prevPoint, currentPoint) +
+ DataPoint.calculateRadiansBetween(currentPoint, nextPoint);
+ double dist = Distance.convertRadiansToDistance(rads, distUnits);
+ String speed = roundedNumber(3600 * dist / diff) + " " + speedUnitsStr;
+ _speedLabel.setText(I18nManager.getText("details.speed") + ": " + speed);
+ }
+ }
+ }
_timeLabel.setText(LABEL_POINT_TIMESTAMP + currentPoint.getTimestamp().getText());
- else
+ }
+ else {
_timeLabel.setText("");
+ }
String name = currentPoint.getWaypointName();
if (name != null && !name.equals(""))
{
{
_rangeLabel.setText(I18nManager.getText("details.norangeselection"));
_distanceLabel.setText("");
+ _movingDistanceLabel.setText("");
_durationLabel.setText("");
_altRangeLabel.setText("");
_updownLabel.setText("");
+ _aveSpeedLabel.setText("");
+ _aveMovingSpeedLabel.setText("");
}
else
{
- _rangeLabel.setText(LABEL_RANGE_SELECTED1
+ _rangeLabel.setText(LABEL_RANGE_SELECTED
+ (selection.getStart()+1) + " " + I18nManager.getText("details.range.to")
+ " " + (selection.getEnd()+1));
- if (_distUnitsDropdown.getSelectedIndex() == 0)
- _distanceLabel.setText(LABEL_RANGE_DISTANCE + buildDistanceString(
- selection.getDistance(Distance.UNITS_KILOMETRES))
- + " " + I18nManager.getText("units.kilometres.short"));
- else
- _distanceLabel.setText(LABEL_RANGE_DISTANCE + buildDistanceString(
- selection.getDistance(Distance.UNITS_MILES))
- + " " + I18nManager.getText("units.miles.short"));
+ _distanceLabel.setText(LABEL_RANGE_DISTANCE + roundedNumber(selection.getDistance(distUnits)) + " " + distUnitsStr);
+ _movingDistanceLabel.setText(LABEL_RANGE_MOVINGDISTANCE + roundedNumber(selection.getMovingDistance(distUnits)) + " " + distUnitsStr);
if (selection.getNumSeconds() > 0)
+ {
_durationLabel.setText(LABEL_RANGE_DURATION + buildDurationString(selection.getNumSeconds()));
- else
+ _aveSpeedLabel.setText(I18nManager.getText("details.range.avespeed") + ": "
+ + roundedNumber(selection.getDistance(distUnits)/selection.getNumSeconds()*3600.0) + " " + speedUnitsStr);
+ _aveMovingSpeedLabel.setText(I18nManager.getText("details.range.avemovingspeed") + ": "
+ + roundedNumber(selection.getMovingDistance(distUnits)/selection.getMovingSeconds()*3600.0) + " " + speedUnitsStr);
+ }
+ else {
_durationLabel.setText("");
+ _aveSpeedLabel.setText("");
+ _aveMovingSpeedLabel.setText("");
+ }
String altUnitsLabel = getAltitudeUnitsLabel(selection.getAltitudeFormat());
IntegerRange altRange = selection.getAltitudeRange();
if (altRange.getMinimum() >= 0 && altRange.getMaximum() >= 0)
{
// no photo, hide details
_photoLabel.setText(I18nManager.getText("details.nophoto"));
+ _photoTimestampLabel.setText("");
_photoConnectedLabel.setText("");
_photoThumbnail.setVisible(false);
}
{
if (currentPhoto == null) {currentPhoto = currentPoint.getPhoto();}
_photoLabel.setText(I18nManager.getText("details.photofile") + ": " + currentPhoto.getFile().getName());
+ _photoLabel.setText(LABEL_POINT_TIMESTAMP + currentPhoto.getTimestamp().getText());
_photoConnectedLabel.setText(I18nManager.getText("details.photo.connected") + ": "
+ (currentPhoto.getCurrentStatus() == PhotoStatus.NOT_CONNECTED ?
I18nManager.getText("dialog.about.no"):I18nManager.getText("dialog.about.yes")));
+ " " + (inNumSecs % 60) + I18nManager.getText("display.range.time.secs");
if (inNumSecs < 86400L) return "" + (inNumSecs / 60 / 60) + I18nManager.getText("display.range.time.hours")
+ " " + ((inNumSecs / 60) % 60) + I18nManager.getText("display.range.time.mins");
+ if (inNumSecs < 432000L) return "" + (inNumSecs / 86400L) + I18nManager.getText("display.range.time.days")
+ + " " + (inNumSecs / 60 / 60) + I18nManager.getText("display.range.time.hours");
if (inNumSecs < 8640000L) return "" + (inNumSecs / 86400L) + I18nManager.getText("display.range.time.days");
return "big";
}
/**
- * Build a String to describe a distance
+ * Format a number to a sensible precision
* @param inDist distance
* @return formatted String
*/
- private String buildDistanceString(double inDist)
+ private String roundedNumber(double inDist)
{
// Set precision of formatter
int numDigits = 0;
projects / GpsPrune.git / blobdiff