]> gitweb.fperrin.net Git - GpsPrune.git/blobdiff - tim/prune/gui/DetailsDisplay.java
Version 19, May 2018
[GpsPrune.git] / tim / prune / gui / DetailsDisplay.java
index c40f8c2b4891360144bfe60d55dfd4817fd9a456..2fa98dc9c0907d52e19489372c15eff227f5e37a 100644 (file)
@@ -3,30 +3,44 @@ package tim.prune.gui;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.Font;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.text.NumberFormat;
+import java.util.TimeZone;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
+import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JProgressBar;
 import javax.swing.border.EtchedBorder;
 
-import tim.prune.Config;
 import tim.prune.DataSubscriber;
+import tim.prune.FunctionLibrary;
+import tim.prune.GenericFunction;
 import tim.prune.I18nManager;
-import tim.prune.data.Altitude;
+import tim.prune.UpdateMessageBroker;
+import tim.prune.config.Config;
+import tim.prune.config.TimezoneHelper;
+import tim.prune.data.AltitudeRange;
+import tim.prune.data.AudioClip;
 import tim.prune.data.Coordinate;
 import tim.prune.data.DataPoint;
-import tim.prune.data.Distance;
-import tim.prune.data.IntegerRange;
+import tim.prune.data.Field;
 import tim.prune.data.Photo;
 import tim.prune.data.Selection;
+import tim.prune.data.SourceInfo;
+import tim.prune.data.SpeedCalculator;
+import tim.prune.data.SpeedValue;
 import tim.prune.data.TrackInfo;
+import tim.prune.data.Unit;
+import tim.prune.data.UnitSet;
+import tim.prune.data.UnitSetLibrary;
 
 /**
  * Class to hold point details and selection details
@@ -37,45 +51,67 @@ public class DetailsDisplay extends GenericDisplay
        // Point details
        private JLabel _indexLabel = null;
        private JLabel _latLabel = null, _longLabel = null;
-       private JLabel _altLabel = null, _nameLabel = null;
-       private JLabel _timeLabel = null, _speedLabel = null;
+       private JLabel _altLabel = null;
+       private JLabel _ptDateLabel = null, _ptTimeLabel = null;
+       private JLabel _descLabel = null;
+       private JLabel _speedLabel = null, _vSpeedLabel = null;
+       private JLabel _nameLabel = null, _typeLabel = null;
+       private JLabel _filenameLabel = null;
 
        // Range details
        private JLabel _rangeLabel = null;
-       private JLabel _distanceLabel = null, _movingDistanceLabel = null;
+       private JLabel _distanceLabel = null;
        private JLabel _durationLabel = null;
        private JLabel _altRangeLabel = null, _updownLabel = null;
-       private JLabel _aveSpeedLabel = null, _aveMovingSpeedLabel = null;
-       private JLabel _paceLabel = null;
+       private JLabel _aveSpeedLabel = null;
 
        // Photo details
+       private JPanel _photoDetailsPanel = null;
        private JLabel _photoLabel = null;
+       private JLabel _photoPathLabel = null;
        private PhotoThumbnail _photoThumbnail = null;
        private JLabel _photoTimestampLabel = null;
        private JLabel _photoConnectedLabel = null;
+       private JLabel _photoBearingLabel = null;
+       private JPanel _rotationButtons = null;
+
+       // Audio details
+       private JPanel _audioDetailsPanel = null;
+       private JLabel _audioLabel = null;
+       private JLabel _audioPathLabel = null;
+       private JLabel _audioConnectedLabel = null;
+       private JLabel _audioTimestampLabel = null;
+       private JLabel _audioLengthLabel = null;
+       private JProgressBar _audioProgress = null;
+       private JPanel _playAudioPanel = null;
 
        // Units
-       private JComboBox _coordFormatDropdown = null;
-       private JComboBox _distUnitsDropdown = null;
-       // Formatter
-       private NumberFormat _distanceFormatter = NumberFormat.getInstance();
+       private JComboBox<String> _coordFormatDropdown = null;
+       private JComboBox<String> _distUnitsDropdown = null;
+       // Timezone
+       private TimeZone _timezone = null;
 
        // Cached labels
        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_DATE     = I18nManager.getText("fieldname.date") + ": ";
+       private static final String LABEL_POINT_TIME     = I18nManager.getText("fieldname.timestamp") + ": ";
        private static final String LABEL_POINT_WAYPOINTNAME = I18nManager.getText("fieldname.waypointname") + ": ";
+       private static final String LABEL_POINT_WAYPOINTTYPE = I18nManager.getText("fieldname.waypointtype") + ": ";
+       private static final String LABEL_POINT_DESCRIPTION  = I18nManager.getText("fieldname.description") + ": ";
+       private static final String LABEL_POINT_SPEED        = I18nManager.getText("fieldname.speed") + ": ";
+       private static final String LABEL_POINT_VERTSPEED    = I18nManager.getText("fieldname.verticalspeed") + ": ";
+       private static final String LABEL_POINT_FILENAME     = I18nManager.getText("details.track.file") + ": ";
        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") + ": ";
-       private static String LABEL_POINT_ALTITUDE_UNITS = null;
-       private static Altitude.Format LABEL_POINT_ALTITUDE_FORMAT = Altitude.Format.NO_FORMAT;
+       private static final String LABEL_AUDIO_FILE = I18nManager.getText("details.audio.file") + ": ";
+       private static final String LABEL_FULL_PATH = I18nManager.getText("details.media.fullpath") + ": ";
 
 
        /**
@@ -90,18 +126,11 @@ public class DetailsDisplay extends GenericDisplay
                JPanel mainPanel = new JPanel();
                mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
                mainPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
+               Font biggerFont = new JLabel().getFont();
+               biggerFont = biggerFont.deriveFont(Font.BOLD, biggerFont.getSize2D() + 2.0f);
 
                // Point details panel
-               JPanel pointDetailsPanel = new JPanel();
-               pointDetailsPanel.setLayout(new BoxLayout(pointDetailsPanel, BoxLayout.Y_AXIS));
-               pointDetailsPanel.setBorder(BorderFactory.createCompoundBorder(
-                       BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3))
-               );
-               JLabel pointDetailsLabel = new JLabel(I18nManager.getText("details.pointdetails"));
-               Font biggerFont = pointDetailsLabel.getFont();
-               biggerFont = biggerFont.deriveFont(Font.BOLD, biggerFont.getSize2D() + 2.0f);
-               pointDetailsLabel.setFont(biggerFont);
-               pointDetailsPanel.add(pointDetailsLabel);
+               JPanel pointDetailsPanel = makeDetailsPanel("details.pointdetails", biggerFont);
                _indexLabel = new JLabel(I18nManager.getText("details.nopointselection"));
                pointDetailsPanel.add(_indexLabel);
                _latLabel = new JLabel("");
@@ -110,37 +139,36 @@ public class DetailsDisplay extends GenericDisplay
                pointDetailsPanel.add(_longLabel);
                _altLabel = new JLabel("");
                pointDetailsPanel.add(_altLabel);
-               _timeLabel = new JLabel("");
-               pointDetailsPanel.add(_timeLabel);
+               _ptDateLabel = new JLabel("");
+               _ptDateLabel.setMinimumSize(new Dimension(120, 10));
+               pointDetailsPanel.add(_ptDateLabel);
+               _ptTimeLabel = new JLabel("");
+               _ptTimeLabel.setMinimumSize(new Dimension(120, 10));
+               pointDetailsPanel.add(_ptTimeLabel);
+               _descLabel = new JLabel("");
+               pointDetailsPanel.add(_descLabel);
                _speedLabel = new JLabel("");
                pointDetailsPanel.add(_speedLabel);
+               _vSpeedLabel = new JLabel("");
+               pointDetailsPanel.add(_vSpeedLabel);
                _nameLabel = new JLabel("");
                pointDetailsPanel.add(_nameLabel);
+               _typeLabel = new JLabel("");
+               pointDetailsPanel.add(_typeLabel);
+               _filenameLabel = new JLabel("");
+               pointDetailsPanel.add(_filenameLabel);
                pointDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
 
                // range details panel
-               JPanel rangeDetailsPanel = new JPanel();
-               rangeDetailsPanel.setLayout(new BoxLayout(rangeDetailsPanel, BoxLayout.Y_AXIS));
-               rangeDetailsPanel.setBorder(BorderFactory.createCompoundBorder(
-                       BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3))
-               );
-               JLabel rangeDetailsLabel = new JLabel(I18nManager.getText("details.rangedetails"));
-               rangeDetailsLabel.setFont(biggerFont);
-               rangeDetailsPanel.add(rangeDetailsLabel);
+               JPanel rangeDetailsPanel = makeDetailsPanel("details.rangedetails", biggerFont);
                _rangeLabel = new JLabel(I18nManager.getText("details.norangeselection"));
                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);
-               _paceLabel = new JLabel("");
-               rangeDetailsPanel.add(_paceLabel);
                _altRangeLabel = new JLabel("");
                rangeDetailsPanel.add(_altRangeLabel);
                _updownLabel = new JLabel("");
@@ -148,31 +176,74 @@ public class DetailsDisplay extends GenericDisplay
                rangeDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
 
                // photo details panel
-               JPanel photoDetailsPanel = new JPanel();
-               photoDetailsPanel.setLayout(new BoxLayout(photoDetailsPanel, BoxLayout.Y_AXIS));
-               photoDetailsPanel.setBorder(BorderFactory.createCompoundBorder(
-                       BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3))
-               );
-               JLabel photoDetailsLabel = new JLabel(I18nManager.getText("details.photodetails"));
-               photoDetailsLabel.setFont(biggerFont);
-               photoDetailsPanel.add(photoDetailsLabel);
+               _photoDetailsPanel = makeDetailsPanel("details.photodetails", biggerFont);
                _photoLabel = new JLabel(I18nManager.getText("details.nophoto"));
-               photoDetailsPanel.add(_photoLabel);
+               _photoDetailsPanel.add(_photoLabel);
+               _photoPathLabel = new JLabel("");
+               _photoDetailsPanel.add(_photoPathLabel);
                _photoTimestampLabel = new JLabel("");
-               photoDetailsPanel.add(_photoTimestampLabel);
+               _photoTimestampLabel.setMinimumSize(new Dimension(120, 10));
+               _photoDetailsPanel.add(_photoTimestampLabel);
                _photoConnectedLabel = new JLabel("");
-               photoDetailsPanel.add(_photoConnectedLabel);
+               _photoDetailsPanel.add(_photoConnectedLabel);
+               _photoBearingLabel = new JLabel("");
+               _photoDetailsPanel.add(_photoBearingLabel);
                _photoThumbnail = new PhotoThumbnail();
                _photoThumbnail.setVisible(false);
                _photoThumbnail.setPreferredSize(new Dimension(100, 100));
-               photoDetailsPanel.add(_photoThumbnail);
+               _photoDetailsPanel.add(_photoThumbnail);
+               // Rotate buttons
+               JButton rotLeft = makeRotateButton(IconManager.ROTATE_LEFT, FunctionLibrary.FUNCTION_ROTATE_PHOTO_LEFT);
+               JButton rotRight = makeRotateButton(IconManager.ROTATE_RIGHT, FunctionLibrary.FUNCTION_ROTATE_PHOTO_RIGHT);
+               JButton popup = makeRotateButton(IconManager.SHOW_DETAILS, FunctionLibrary.FUNCTION_PHOTO_POPUP);
+               _rotationButtons = new JPanel();
+               _rotationButtons.add(rotLeft);
+               _rotationButtons.add(rotRight);
+               _rotationButtons.add(Box.createHorizontalStrut(10));
+               _rotationButtons.add(popup);
+               _rotationButtons.setAlignmentX(Component.LEFT_ALIGNMENT);
+               _rotationButtons.setVisible(false);
+               _photoDetailsPanel.add(_rotationButtons);
+               _photoDetailsPanel.setVisible(false);
+
+               // audio details panel
+               _audioDetailsPanel = makeDetailsPanel("details.audiodetails", biggerFont);
+               _audioLabel = new JLabel(I18nManager.getText("details.noaudio"));
+               _audioDetailsPanel.add(_audioLabel);
+               _audioPathLabel = new JLabel("");
+               _audioDetailsPanel.add(_audioPathLabel);
+               _audioTimestampLabel = new JLabel("");
+               _audioTimestampLabel.setMinimumSize(new Dimension(120, 10));
+               _audioDetailsPanel.add(_audioTimestampLabel);
+               _audioLengthLabel = new JLabel("");
+               _audioDetailsPanel.add(_audioLengthLabel);
+               _audioConnectedLabel = new JLabel("");
+               _audioDetailsPanel.add(_audioConnectedLabel);
+               _audioProgress = new JProgressBar(0, 100);
+               _audioProgress.setString(I18nManager.getText("details.audio.playing"));
+               _audioProgress.setStringPainted(true);
+               _audioProgress.setVisible(false);
+               _audioDetailsPanel.add(_audioProgress);
+               _playAudioPanel = new JPanel();
+               _playAudioPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
+               JButton playAudio = makeRotateButton(IconManager.PLAY_AUDIO, FunctionLibrary.FUNCTION_PLAY_AUDIO);
+               playAudio.addActionListener(new AudioListener(_audioProgress));
+               _playAudioPanel.add(playAudio);
+               JButton stopAudio = makeRotateButton(IconManager.STOP_AUDIO, FunctionLibrary.FUNCTION_STOP_AUDIO);
+               _playAudioPanel.add(stopAudio);
+               _playAudioPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
+               _playAudioPanel.setVisible(false);
+               _audioDetailsPanel.add(_playAudioPanel);
+               _audioDetailsPanel.setVisible(false);
 
                // add the details panels to the main panel
                mainPanel.add(pointDetailsPanel);
                mainPanel.add(Box.createVerticalStrut(5));
                mainPanel.add(rangeDetailsPanel);
                mainPanel.add(Box.createVerticalStrut(5));
-               mainPanel.add(photoDetailsPanel);
+               mainPanel.add(_photoDetailsPanel);
+               mainPanel.add(Box.createVerticalStrut(5));
+               mainPanel.add(_audioDetailsPanel);
                mainPanel.add(Box.createVerticalStrut(5));
                // add the main panel at the top
                add(mainPanel, BorderLayout.NORTH);
@@ -185,7 +256,7 @@ public class DetailsDisplay extends GenericDisplay
                lowerPanel.add(coordFormatLabel);
                String[] coordFormats = {I18nManager.getText("units.original"), I18nManager.getText("units.degminsec"),
                        I18nManager.getText("units.degmin"), I18nManager.getText("units.deg")};
-               _coordFormatDropdown = new JComboBox(coordFormats);
+               _coordFormatDropdown = new JComboBox<String>(coordFormats);
                _coordFormatDropdown.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e)
                        {
@@ -197,14 +268,18 @@ public class DetailsDisplay extends GenericDisplay
                JLabel unitsLabel = new JLabel(I18nManager.getText("details.distanceunits") + ": ");
                unitsLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
                lowerPanel.add(unitsLabel);
-               String[] distUnits = {I18nManager.getText("units.kilometres"), I18nManager.getText("units.miles")};
-               _distUnitsDropdown = new JComboBox(distUnits);
-               if (!Config.getConfigBoolean(Config.KEY_METRIC_UNITS)) {_distUnitsDropdown.setSelectedIndex(1);}
+               // Make dropdown for distance units
+               _distUnitsDropdown = new JComboBox<String>();
+               final UnitSet currUnits = Config.getUnitSet();
+               for (int i=0; i<UnitSetLibrary.getNumUnitSets(); i++) {
+                       _distUnitsDropdown.addItem(I18nManager.getText(UnitSetLibrary.getUnitSet(i).getDistanceUnit().getNameKey()));
+                       if (UnitSetLibrary.getUnitSet(i) == currUnits) {_distUnitsDropdown.setSelectedIndex(i);}
+               }
                _distUnitsDropdown.addActionListener(new ActionListener() {
                        public void actionPerformed(ActionEvent e)
                        {
-                               dataUpdated(DataSubscriber.UNITS_CHANGED);
-                               Config.setConfigBoolean(Config.KEY_METRIC_UNITS, _distUnitsDropdown.getSelectedIndex() == 0);
+                               Config.selectUnitSet(_distUnitsDropdown.getSelectedIndex());
+                               UpdateMessageBroker.informSubscribers(DataSubscriber.UNITS_CHANGED);
                        }
                });
                lowerPanel.add(_distUnitsDropdown);
@@ -222,19 +297,30 @@ public class DetailsDisplay extends GenericDisplay
                // Update current point data, if any
                DataPoint currentPoint = _trackInfo.getCurrentPoint();
                Selection selection = _trackInfo.getSelection();
+               if ((inUpdateType | DATA_ADDED_OR_REMOVED) > 0) selection.markInvalid();
                int currentPointIndex = selection.getCurrentPointIndex();
                _speedLabel.setText("");
-               Distance.Units 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");
+               UnitSet unitSet = UnitSetLibrary.getUnitSet(_distUnitsDropdown.getSelectedIndex());
+               String distUnitsStr = I18nManager.getText(unitSet.getDistanceUnit().getShortnameKey());
+               String speedUnitsStr = I18nManager.getText(unitSet.getSpeedUnit().getShortnameKey());
+               if (_timezone == null || (inUpdateType | UNITS_CHANGED) > 0) {
+                       _timezone = TimezoneHelper.getSelectedTimezone();
+               }
+
                if (_track == null || currentPoint == null)
                {
                        _indexLabel.setText(I18nManager.getText("details.nopointselection"));
                        _latLabel.setText("");
                        _longLabel.setText("");
                        _altLabel.setText("");
-                       _timeLabel.setText("");
+                       _ptDateLabel.setText("");
+                       _ptTimeLabel.setText("");
+                       _descLabel.setText("");
                        _nameLabel.setText("");
+                       _typeLabel.setText("");
+                       _speedLabel.setText("");
+                       _vSpeedLabel.setText("");
+                       _filenameLabel.setText("");
                }
                else
                {
@@ -243,40 +329,94 @@ public class DetailsDisplay extends GenericDisplay
                                + " " + _track.getNumPoints());
                        _latLabel.setText(makeCoordinateLabel(LABEL_POINT_LATITUDE, currentPoint.getLatitude(), _coordFormatDropdown.getSelectedIndex()));
                        _longLabel.setText(makeCoordinateLabel(LABEL_POINT_LONGITUDE, currentPoint.getLongitude(), _coordFormatDropdown.getSelectedIndex()));
+                       Unit altUnit = Config.getUnitSet().getAltitudeUnit();
                        _altLabel.setText(currentPoint.hasAltitude()?
-                               (LABEL_POINT_ALTITUDE + currentPoint.getAltitude().getValue() + getAltitudeUnitsLabel(currentPoint.getAltitude().getFormat()))
-                               :"");
-                       if (currentPoint.getTimestamp().isValid())
+                               (LABEL_POINT_ALTITUDE + currentPoint.getAltitude().getValue(altUnit) + " " +
+                               I18nManager.getText(altUnit.getShortnameKey()))
+                               : "");
+                       if (currentPoint.hasTimestamp())
                        {
-                               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 && diff > 0)
-                                               {
-                                                       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("fieldname.speed") + ": " + speed);
-                                               }
-                                       }
+                               _ptDateLabel.setText(LABEL_POINT_DATE + currentPoint.getTimestamp().getDateText(_timezone));
+                               _ptTimeLabel.setText(LABEL_POINT_TIME + currentPoint.getTimestamp().getTimeText(_timezone));
+                       }
+                       else
+                       {
+                               _ptDateLabel.setText("");
+                               _ptTimeLabel.setText("");
+                       }
+                       // Maybe the point has a description?
+                       String pointDesc = currentPoint.getFieldValue(Field.DESCRIPTION);
+                       if (pointDesc == null || pointDesc.equals("") || currentPoint.hasMedia()) {
+                               _descLabel.setText("");
+                               _descLabel.setToolTipText("");
+                       }
+                       else
+                       {
+                               if (pointDesc.length() < 5) {
+                                       _descLabel.setText(LABEL_POINT_DESCRIPTION + pointDesc);
                                }
-                               _timeLabel.setText(LABEL_POINT_TIMESTAMP + currentPoint.getTimestamp().getText());
+                               else {
+                                       _descLabel.setText(shortenString(pointDesc));
+                               }
+                               _descLabel.setToolTipText(pointDesc);
+                       }
+
+                       // Speed can come from either timestamps and distances, or speed values in data
+                       SpeedValue speedValue = new SpeedValue();
+                       SpeedCalculator.calculateSpeed(_track, currentPointIndex, speedValue);
+                       if (speedValue.isValid())
+                       {
+                               String speed = DisplayUtils.roundedNumber(speedValue.getValue()) + " " + speedUnitsStr;
+                               _speedLabel.setText(LABEL_POINT_SPEED + speed);
                        }
                        else {
-                               _timeLabel.setText("");
+                               _speedLabel.setText("");
                        }
-                       String name = currentPoint.getWaypointName();
+
+                       // Now do the vertical speed in the same way
+                       SpeedCalculator.calculateVerticalSpeed(_track, currentPointIndex, speedValue);
+                       if (speedValue.isValid())
+                       {
+                               String vSpeedUnitsStr = I18nManager.getText(unitSet.getVerticalSpeedUnit().getShortnameKey());
+                               String speed = DisplayUtils.roundedNumber(speedValue.getValue()) + " " + vSpeedUnitsStr;
+                               _vSpeedLabel.setText(LABEL_POINT_VERTSPEED + speed);
+                       }
+                       else {
+                               _vSpeedLabel.setText("");
+                       }
+
+                       // Waypoint name
+                       final String name = currentPoint.getWaypointName();
                        if (name != null && !name.equals(""))
                        {
                                _nameLabel.setText(LABEL_POINT_WAYPOINTNAME + name);
                        }
                        else _nameLabel.setText("");
+                       // Waypoint type
+                       final String type = currentPoint.getFieldValue(Field.WAYPT_TYPE);
+                       if (type != null && !type.equals("")) {
+                               _typeLabel.setText(LABEL_POINT_WAYPOINTTYPE + type);
+                       }
+                       else _typeLabel.setText("");
+
+                       // File to which point belongs
+                       final int numFiles = _trackInfo.getFileInfo().getNumFiles();
+                       String filename = null;
+                       if (numFiles > 1)
+                       {
+                               final SourceInfo info = _trackInfo.getFileInfo().getSourceForPoint(currentPoint);
+                               if (info != null) {
+                                       filename = info.getName();
+                               }
+                       }
+                       if (filename != null) {
+                               _filenameLabel.setText(LABEL_POINT_FILENAME + filename);
+                               _filenameLabel.setToolTipText(filename);
+                       }
+                       else {
+                               _filenameLabel.setText("");
+                               _filenameLabel.setToolTipText("");
+                       }
                }
 
                // Update range details
@@ -284,63 +424,39 @@ public class DetailsDisplay extends GenericDisplay
                {
                        _rangeLabel.setText(I18nManager.getText("details.norangeselection"));
                        _distanceLabel.setText("");
-                       _movingDistanceLabel.setText("");
                        _durationLabel.setText("");
                        _altRangeLabel.setText("");
                        _updownLabel.setText("");
                        _aveSpeedLabel.setText("");
-                       _aveMovingSpeedLabel.setText("");
-                       _paceLabel.setText("");
                }
                else
                {
                        _rangeLabel.setText(LABEL_RANGE_SELECTED
                                + (selection.getStart()+1) + " " + I18nManager.getText("details.range.to")
                                + " " + (selection.getEnd()+1));
-                       _distanceLabel.setText(LABEL_RANGE_DISTANCE + roundedNumber(selection.getDistance(distUnits)) + " " + distUnitsStr);
-                       if (selection.getHasMultipleSegments()) {
-                               _movingDistanceLabel.setText(LABEL_RANGE_MOVINGDISTANCE + roundedNumber(selection.getMovingDistance(distUnits)) + " " + distUnitsStr);
-                       }
-                       else {
-                               _movingDistanceLabel.setText(null);
-                       }
-                       if (selection.getNumSeconds() > 0)
+                       _distanceLabel.setText(LABEL_RANGE_DISTANCE + DisplayUtils.roundedNumber(selection.getMovingDistance()) + " " + distUnitsStr);
+                       final long numMovingSeconds = selection.getMovingSeconds();
+                       if (numMovingSeconds > 0L)
                        {
-                               _durationLabel.setText(LABEL_RANGE_DURATION + buildDurationString(selection.getNumSeconds()));
+                               _durationLabel.setText(LABEL_RANGE_DURATION + DisplayUtils.buildDurationString(numMovingSeconds));
                                _aveSpeedLabel.setText(I18nManager.getText("details.range.avespeed") + ": "
-                                       + roundedNumber(selection.getDistance(distUnits)/selection.getNumSeconds()*3600.0) + " " + speedUnitsStr);
-                               if (selection.getHasMultipleSegments()) {
-                                       _aveMovingSpeedLabel.setText(I18nManager.getText("details.range.avemovingspeed") + ": "
-                                               + roundedNumber(selection.getMovingDistance(distUnits)/selection.getMovingSeconds()*3600.0) + " " + speedUnitsStr);
-                               }
-                               else {
-                                       _aveMovingSpeedLabel.setText(null);
-                               }
-                               if (Config.getConfigBoolean(Config.KEY_SHOW_PACE)) {
-                                       _paceLabel.setText(I18nManager.getText("details.range.pace") + ": "
-                                               + buildDurationString((long) (selection.getNumSeconds()/selection.getDistance(distUnits)))
-                                               + " / " + distUnitsStr);
-                               }
-                               else {
-                                       _paceLabel.setText("");
-                               }
+                                       + DisplayUtils.roundedNumber(selection.getMovingDistance()/numMovingSeconds*3600.0) + " " + speedUnitsStr);
                        }
                        else {
                                _durationLabel.setText("");
                                _aveSpeedLabel.setText("");
-                               _aveMovingSpeedLabel.setText("");
-                               _paceLabel.setText("");
                        }
-                       String altUnitsLabel = getAltitudeUnitsLabel(selection.getAltitudeFormat());
-                       IntegerRange altRange = selection.getAltitudeRange();
-                       if (altRange.getMinimum() >= 0 && altRange.getMaximum() >= 0)
+                       AltitudeRange altRange = selection.getAltitudeRange();
+                       Unit altUnit = Config.getUnitSet().getAltitudeUnit();
+                       String altUnitsLabel = I18nManager.getText(altUnit.getShortnameKey());
+                       if (altRange.hasRange())
                        {
                                _altRangeLabel.setText(LABEL_RANGE_ALTITUDE
-                                       + altRange.getMinimum() + altUnitsLabel + " "
+                                       + altRange.getMinimum(altUnit) + altUnitsLabel + " "
                                        + I18nManager.getText("details.altitude.to") + " "
-                                       + altRange.getMaximum() + altUnitsLabel);
-                               _updownLabel.setText(LABEL_RANGE_CLIMB + selection.getClimb() + altUnitsLabel
-                                       + LABEL_RANGE_DESCENT + selection.getDescent() + altUnitsLabel);
+                                       + altRange.getMaximum(altUnit) + altUnitsLabel);
+                               _updownLabel.setText(LABEL_RANGE_CLIMB + altRange.getClimb(altUnit) + altUnitsLabel
+                                       + LABEL_RANGE_DESCENT + altRange.getDescent(altUnit) + altUnitsLabel);
                        }
                        else
                        {
@@ -349,43 +465,76 @@ public class DetailsDisplay extends GenericDisplay
                        }
                }
                // show photo details and thumbnail
+               _photoDetailsPanel.setVisible(_trackInfo.getPhotoList().getNumPhotos() > 0);
                Photo currentPhoto = _trackInfo.getPhotoList().getPhoto(_trackInfo.getSelection().getCurrentPhotoIndex());
                if ((currentPoint == null || currentPoint.getPhoto() == null) && currentPhoto == null)
                {
                        // no photo, hide details
                        _photoLabel.setText(I18nManager.getText("details.nophoto"));
+                       _photoPathLabel.setText("");
+                       _photoPathLabel.setToolTipText("");
                        _photoTimestampLabel.setText("");
                        _photoConnectedLabel.setText("");
+                       _photoBearingLabel.setText("");
                        _photoThumbnail.setVisible(false);
+                       _rotationButtons.setVisible(false);
                }
                else
                {
                        if (currentPhoto == null) {currentPhoto = currentPoint.getPhoto();}
-                       _photoLabel.setText(I18nManager.getText("details.photofile") + ": " + currentPhoto.getFile().getName());
-                       _photoTimestampLabel.setText(LABEL_POINT_TIMESTAMP + currentPhoto.getTimestamp().getText());
-                       _photoConnectedLabel.setText(I18nManager.getText("details.photo.connected") + ": "
+                       _photoLabel.setText(I18nManager.getText("details.photofile") + ": " + currentPhoto.getName());
+                       String fullPath = currentPhoto.getFullPath();
+                       String shortPath = shortenPath(fullPath);
+                       _photoPathLabel.setText(fullPath == null ? "" : LABEL_FULL_PATH + shortPath);
+                       _photoPathLabel.setToolTipText(currentPhoto.getFullPath());
+                       _photoTimestampLabel.setText(currentPhoto.hasTimestamp() ?
+                               (LABEL_POINT_TIME + currentPhoto.getTimestamp().getText(_timezone))
+                               : "");
+                       _photoConnectedLabel.setText(I18nManager.getText("details.media.connected") + ": "
                                + (currentPhoto.getCurrentStatus() == Photo.Status.NOT_CONNECTED ?
                                        I18nManager.getText("dialog.about.no"):I18nManager.getText("dialog.about.yes")));
+                       if (currentPhoto.getBearing() >= 0.0 && currentPhoto.getBearing() <= 360.0)
+                       {
+                               _photoBearingLabel.setText(I18nManager.getText("details.photo.bearing") + ": "
+                                       + (int) currentPhoto.getBearing() + " \u00B0");
+                       }
+                       else _photoBearingLabel.setText("");
                        _photoThumbnail.setVisible(true);
                        _photoThumbnail.setPhoto(currentPhoto);
+                       _rotationButtons.setVisible(true);
+                       if ((inUpdateType & DataSubscriber.PHOTOS_MODIFIED) > 0) {_photoThumbnail.refresh();}
                }
                _photoThumbnail.repaint();
-       }
 
-
-       /**
-        * Choose the appropriate altitude units label for the specified format
-        * @param inFormat altitude format
-        * @return language-sensitive string
-        */
-       private static String getAltitudeUnitsLabel(Altitude.Format inFormat)
-       {
-               if (inFormat == LABEL_POINT_ALTITUDE_FORMAT && LABEL_POINT_ALTITUDE_UNITS != null)
-                       return LABEL_POINT_ALTITUDE_UNITS;
-               LABEL_POINT_ALTITUDE_FORMAT = inFormat;
-               if (inFormat == Altitude.Format.METRES)
-                       return " " + I18nManager.getText("units.metres.short");
-               return " " + I18nManager.getText("units.feet.short");
+               // audio details
+               _audioDetailsPanel.setVisible(_trackInfo.getAudioList().getNumAudios() > 0);
+               AudioClip currentAudio = _trackInfo.getAudioList().getAudio(_trackInfo.getSelection().getCurrentAudioIndex());
+               if (currentAudio == null)
+               {
+                       _audioLabel.setText(I18nManager.getText("details.noaudio"));
+                       _audioPathLabel.setText("");
+                       _audioPathLabel.setToolTipText("");
+                       _audioTimestampLabel.setText("");
+                       _audioLengthLabel.setText("");
+                       _audioConnectedLabel.setText("");
+               }
+               else
+               {
+                       _audioLabel.setText(LABEL_AUDIO_FILE + currentAudio.getName());
+                       String fullPath = currentAudio.getFullPath();
+                       String shortPath = shortenPath(fullPath);
+                       _audioPathLabel.setText(fullPath == null ? "" : LABEL_FULL_PATH + shortPath);
+                       _audioPathLabel.setToolTipText(fullPath == null ? "" : fullPath);
+                       _audioTimestampLabel.setText(currentAudio.hasTimestamp() ?
+                               (LABEL_POINT_TIME + currentAudio.getTimestamp().getText(_timezone))
+                               : "");
+                       int audioLength = currentAudio.getLengthInSeconds();
+                       _audioLengthLabel.setText(audioLength < 0?"":LABEL_RANGE_DURATION + DisplayUtils.buildDurationString(audioLength));
+                       _audioConnectedLabel.setText(I18nManager.getText("details.media.connected") + ": "
+                               + (currentAudio.getCurrentStatus() == Photo.Status.NOT_CONNECTED ?
+                                       I18nManager.getText("dialog.about.no"):I18nManager.getText("dialog.about.yes")));
+               }
+               _playAudioPanel.setVisible(currentAudio != null);
        }
 
 
@@ -409,48 +558,103 @@ public class DetailsDisplay extends GenericDisplay
                        default: // just as it was
                                coord = inCoordinate.output(Coordinate.FORMAT_NONE);
                }
-               return inPrefix + coord;
+               // Fix broken degree signs (due to unicode mangling)
+               final char brokenDeg = 65533;
+               if (coord.indexOf(brokenDeg) >= 0) {
+                       coord = coord.replaceAll(String.valueOf(brokenDeg), "\u00B0");
+               }
+               return inPrefix + restrictDP(coord);
        }
 
 
        /**
-        * Build a String to describe a time duration
-        * @param inNumSecs number of seconds
-        * @return time as a string, days, hours, mins, secs as appropriate
+        * Restrict the given coordinate to a limited number of decimal places for display
+        * @param inCoord coordinate string
+        * @return chopped string
         */
-       private static String buildDurationString(long inNumSecs)
+       private static String restrictDP(String inCoord)
        {
-               if (inNumSecs <= 0L) return "";
-               if (inNumSecs < 60L) return "" + inNumSecs + I18nManager.getText("display.range.time.secs");
-               if (inNumSecs < 3600L) return "" + (inNumSecs / 60) + I18nManager.getText("display.range.time.mins")
-                       + " " + (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) % 24 + I18nManager.getText("display.range.time.hours");
-               if (inNumSecs < 8640000L) return "" + (inNumSecs / 86400L) + I18nManager.getText("display.range.time.days");
-               return "big";
+               final int DECIMAL_PLACES = 7;
+               if (inCoord == null) return "";
+               String result = inCoord;
+               final int dotPos = Math.max(inCoord.lastIndexOf('.'), inCoord.lastIndexOf(','));
+               if (dotPos >= 0)
+               {
+                       final int chopPos = dotPos + DECIMAL_PLACES;
+                       if (chopPos < (inCoord.length()-1))
+                       {
+                               result = inCoord.substring(0, chopPos);
+                               // Maybe there's an exponential in there too which needs to be appended
+                               int expPos = inCoord.toUpperCase().indexOf("E", chopPos);
+                               if (expPos > 0 && expPos < (inCoord.length()-1))
+                               {
+                                       result += inCoord.substring(expPos);
+                               }
+                       }
+               }
+               return result;
+       }
+
+       /**
+        * Make a details subpanel
+        * @param inNameKey key to use for top label
+        * @param inFont font for top label
+        * @return panel with correct layout, label
+        */
+       private static JPanel makeDetailsPanel(String inNameKey, Font inFont)
+       {
+               JPanel detailsPanel = new JPanel();
+               detailsPanel.setLayout(new BoxLayout(detailsPanel, BoxLayout.Y_AXIS));
+               detailsPanel.setBorder(BorderFactory.createCompoundBorder(
+                       BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3))
+               );
+               JLabel detailsLabel = new JLabel(I18nManager.getText(inNameKey));
+               detailsLabel.setFont(inFont);
+               detailsPanel.add(detailsLabel);
+               return detailsPanel;
        }
 
+       /**
+        * Create a little button for rotating the current photo
+        * @param inIcon icon to use (from IconManager)
+        * @param inFunction function to call (from FunctionLibrary)
+        * @return button object
+        */
+       private static JButton makeRotateButton(String inIcon, GenericFunction inFunction)
+       {
+               JButton button = new JButton(IconManager.getImageIcon(inIcon));
+               button.setToolTipText(I18nManager.getText(inFunction.getNameKey()));
+               button.setMargin(new Insets(0, 2, 0, 2));
+               button.addActionListener(new FunctionLauncher(inFunction));
+               return button;
+       }
 
        /**
-        * Format a number to a sensible precision
-        * @param inDist distance
-        * @return formatted String
+        * @param inFullPath full file path or URL to be shortened
+        * @return shortened string from beginning of path
         */
-       private String roundedNumber(double inDist)
+       private static String shortenPath(String inFullPath)
        {
-               // Set precision of formatter
-               int numDigits = 0;
-               if (inDist < 1.0)
-                       numDigits = 3;
-               else if (inDist < 10.0)
-                       numDigits = 2;
-               else if (inDist < 100.0)
-                       numDigits = 1;
-               // set formatter
-               _distanceFormatter.setMaximumFractionDigits(numDigits);
-               _distanceFormatter.setMinimumFractionDigits(numDigits);
-               return _distanceFormatter.format(inDist);
+               String path = inFullPath;
+               // Chop off the home path if possible
+               final String homePath = System.getProperty("user.home").toLowerCase();
+               if (inFullPath != null && inFullPath.toLowerCase().startsWith(homePath)) {
+                       path = inFullPath.substring(homePath.length()+1);
+               }
+               return shortenString(path);
+       }
+
+       /**
+        * @param inString string to shorten
+        * @return shortened string from the beginning
+        */
+       private static String shortenString(String inString)
+       {
+               // Limit is hardcoded here, maybe it should depend on parent component width and font size etc?
+               if (inString == null || inString.length() < 21) {
+                       return inString;
+               }
+               // string is too long
+               return inString.substring(0, 20) + "...";
        }
 }