X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fgui%2FDetailsDisplay.java;h=2fa98dc9c0907d52e19489372c15eff227f5e37a;hp=7b3a4ff6843f9b34c4c7df048081a54f92ec17e6;hb=92dad5df664287acb51728e9ea599f150765d34a;hpb=4d5796d02a15808311c09448d79e6e7d1de9d636 diff --git a/tim/prune/gui/DetailsDisplay.java b/tim/prune/gui/DetailsDisplay.java index 7b3a4ff..2fa98dc 100644 --- a/tim/prune/gui/DetailsDisplay.java +++ b/tim/prune/gui/DetailsDisplay.java @@ -8,7 +8,7 @@ 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; @@ -26,6 +26,7 @@ import tim.prune.GenericFunction; import tim.prune.I18nManager; 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; @@ -33,6 +34,7 @@ import tim.prune.data.DataPoint; 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; @@ -50,9 +52,11 @@ public class DetailsDisplay extends GenericDisplay private JLabel _indexLabel = null; private JLabel _latLabel = null, _longLabel = null; private JLabel _altLabel = null; - private JLabel _timeLabel = 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; @@ -82,21 +86,24 @@ public class DetailsDisplay extends GenericDisplay private JPanel _playAudioPanel = null; // Units - private JComboBox _coordFormatDropdown = null; - private JComboBox _distUnitsDropdown = null; - // Formatter - private NumberFormat _distanceFormatter = NumberFormat.getInstance(); + private JComboBox _coordFormatDropdown = null; + private JComboBox _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") + ": "; @@ -132,9 +139,14 @@ public class DetailsDisplay extends GenericDisplay pointDetailsPanel.add(_longLabel); _altLabel = new JLabel(""); pointDetailsPanel.add(_altLabel); - _timeLabel = new JLabel(""); - _timeLabel.setMinimumSize(new Dimension(120, 10)); - 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(""); @@ -143,6 +155,8 @@ public class DetailsDisplay extends GenericDisplay pointDetailsPanel.add(_nameLabel); _typeLabel = new JLabel(""); pointDetailsPanel.add(_typeLabel); + _filenameLabel = new JLabel(""); + pointDetailsPanel.add(_filenameLabel); pointDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT); // range details panel @@ -242,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(coordFormats); _coordFormatDropdown.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -255,7 +269,7 @@ public class DetailsDisplay extends GenericDisplay unitsLabel.setAlignmentX(Component.LEFT_ALIGNMENT); lowerPanel.add(unitsLabel); // Make dropdown for distance units - _distUnitsDropdown = new JComboBox(); + _distUnitsDropdown = new JComboBox(); final UnitSet currUnits = Config.getUnitSet(); for (int i=0; i 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 { @@ -313,11 +334,31 @@ public class DetailsDisplay extends GenericDisplay (LABEL_POINT_ALTITUDE + currentPoint.getAltitude().getValue(altUnit) + " " + I18nManager.getText(altUnit.getShortnameKey())) : ""); - if (currentPoint.hasTimestamp()) { - _timeLabel.setText(LABEL_POINT_TIMESTAMP + currentPoint.getTimestamp().getText()); + if (currentPoint.hasTimestamp()) + { + _ptDateLabel.setText(LABEL_POINT_DATE + currentPoint.getTimestamp().getDateText(_timezone)); + _ptTimeLabel.setText(LABEL_POINT_TIME + currentPoint.getTimestamp().getTimeText(_timezone)); } - else { - _timeLabel.setText(""); + 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); + } + else { + _descLabel.setText(shortenString(pointDesc)); + } + _descLabel.setToolTipText(pointDesc); } // Speed can come from either timestamps and distances, or speed values in data @@ -325,7 +366,7 @@ public class DetailsDisplay extends GenericDisplay SpeedCalculator.calculateSpeed(_track, currentPointIndex, speedValue); if (speedValue.isValid()) { - String speed = roundedNumber(speedValue.getValue()) + " " + speedUnitsStr; + String speed = DisplayUtils.roundedNumber(speedValue.getValue()) + " " + speedUnitsStr; _speedLabel.setText(LABEL_POINT_SPEED + speed); } else { @@ -337,7 +378,7 @@ public class DetailsDisplay extends GenericDisplay if (speedValue.isValid()) { String vSpeedUnitsStr = I18nManager.getText(unitSet.getVerticalSpeedUnit().getShortnameKey()); - String speed = roundedNumber(speedValue.getValue()) + " " + vSpeedUnitsStr; + String speed = DisplayUtils.roundedNumber(speedValue.getValue()) + " " + vSpeedUnitsStr; _vSpeedLabel.setText(LABEL_POINT_VERTSPEED + speed); } else { @@ -357,6 +398,25 @@ public class DetailsDisplay extends GenericDisplay _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 @@ -374,12 +434,13 @@ public class DetailsDisplay extends GenericDisplay _rangeLabel.setText(LABEL_RANGE_SELECTED + (selection.getStart()+1) + " " + I18nManager.getText("details.range.to") + " " + (selection.getEnd()+1)); - _distanceLabel.setText(LABEL_RANGE_DISTANCE + roundedNumber(selection.getDistance()) + " " + distUnitsStr); - 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 + DisplayUtils.buildDurationString(selection.getNumSeconds())); + _durationLabel.setText(LABEL_RANGE_DURATION + DisplayUtils.buildDurationString(numMovingSeconds)); _aveSpeedLabel.setText(I18nManager.getText("details.range.avespeed") + ": " - + roundedNumber(selection.getDistance()/selection.getNumSeconds()*3600.0) + " " + speedUnitsStr); + + DisplayUtils.roundedNumber(selection.getMovingDistance()/numMovingSeconds*3600.0) + " " + speedUnitsStr); } else { _durationLabel.setText(""); @@ -426,7 +487,9 @@ public class DetailsDisplay extends GenericDisplay String shortPath = shortenPath(fullPath); _photoPathLabel.setText(fullPath == null ? "" : LABEL_FULL_PATH + shortPath); _photoPathLabel.setToolTipText(currentPhoto.getFullPath()); - _photoTimestampLabel.setText(currentPhoto.hasTimestamp()?(LABEL_POINT_TIMESTAMP + currentPhoto.getTimestamp().getText()):""); + _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"))); @@ -462,7 +525,9 @@ public class DetailsDisplay extends GenericDisplay String shortPath = shortenPath(fullPath); _audioPathLabel.setText(fullPath == null ? "" : LABEL_FULL_PATH + shortPath); _audioPathLabel.setToolTipText(fullPath == null ? "" : fullPath); - _audioTimestampLabel.setText(currentAudio.hasTimestamp()?(LABEL_POINT_TIMESTAMP + currentAudio.getTimestamp().getText()):""); + _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") + ": " @@ -502,27 +567,6 @@ public class DetailsDisplay extends GenericDisplay } - /** - * Format a number to a sensible precision - * @param inDist distance - * @return formatted String - */ - private String roundedNumber(double inDist) - { - // 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); - } - /** * Restrict the given coordinate to a limited number of decimal places for display * @param inCoord coordinate string @@ -532,14 +576,23 @@ public class DetailsDisplay extends GenericDisplay { final int DECIMAL_PLACES = 7; if (inCoord == null) return ""; + String result = inCoord; final int dotPos = Math.max(inCoord.lastIndexOf('.'), inCoord.lastIndexOf(',')); - if (dotPos >= 0) { + if (dotPos >= 0) + { final int chopPos = dotPos + DECIMAL_PLACES; - if (chopPos < (inCoord.length()-1)) { - return inCoord.substring(0, chopPos); + 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 inCoord; + return result; } /** @@ -582,15 +635,26 @@ public class DetailsDisplay extends GenericDisplay */ private static String shortenPath(String inFullPath) { + 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)) { - inFullPath = inFullPath.substring(homePath.length()+1); + path = inFullPath.substring(homePath.length()+1); } - if (inFullPath == null || inFullPath.length() < 21) { - return inFullPath; + 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; } - // path is too long - return inFullPath.substring(0, 20) + "..."; + // string is too long + return inString.substring(0, 20) + "..."; } }