X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2FDetailsDisplay.java;h=7773062cccc25f006e4620f8c9b82edbbcc7ec99;hb=ca9bdb3916f9c39adbbf95d06ac95c21dafbb4e6;hp=e9ed7472806cf1a058eae06e5c10c50dfdda14a7;hpb=312fec956e43f5d0a38617da5d0add9c62563e2c;p=GpsPrune.git diff --git a/tim/prune/gui/DetailsDisplay.java b/tim/prune/gui/DetailsDisplay.java index e9ed747..7773062 100644 --- a/tim/prune/gui/DetailsDisplay.java +++ b/tim/prune/gui/DetailsDisplay.java @@ -2,33 +2,28 @@ package tim.prune.gui; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.FlowLayout; +import java.awt.Dimension; import java.awt.Font; -import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.AdjustmentEvent; -import java.awt.event.AdjustmentListener; import java.text.NumberFormat; 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.JScrollBar; import javax.swing.border.EtchedBorder; - -import tim.prune.App; +import tim.prune.DataSubscriber; import tim.prune.I18nManager; import tim.prune.data.Altitude; import tim.prune.data.Coordinate; import tim.prune.data.DataPoint; import tim.prune.data.Distance; -import tim.prune.data.Field; import tim.prune.data.IntegerRange; +import tim.prune.data.Photo; +import tim.prune.data.PhotoStatus; import tim.prune.data.Selection; import tim.prune.data.TrackInfo; @@ -38,30 +33,26 @@ import tim.prune.data.TrackInfo; */ public class DetailsDisplay extends GenericDisplay { - // App object to be notified of editing commands - private App _app = null; - - // Track details - private JLabel _trackpointsLabel = null; - private JLabel _filenameLabel = null; // Point details private JLabel _indexLabel = null; private JLabel _latLabel = null, _longLabel = null; private JLabel _altLabel = null, _nameLabel = null; - private JLabel _timeLabel = null; - // Scroll bar - private JScrollBar _scroller = null; - private boolean _ignoreScrollEvents = false; - // Button panel - private JButton _startRangeButton = null, _endRangeButton = null; - private JButton _deletePointButton = null, _deleteRangeButton = null; + private JLabel _timeLabel = null, _speedLabel = null; // Range details private JLabel _rangeLabel = null; private JLabel _distanceLabel = null, _durationLabel = null; private JLabel _altRangeLabel = null, _updownLabel = null; + private JLabel _aveSpeedLabel = null; + + // Photo details + private JLabel _photoLabel = null; + private PhotoThumbnail _photoThumbnail = null; + private JLabel _photoConnectedLabel = null; + // Units - private JComboBox _unitsDropdown = null; + private JComboBox _coordFormatDropdown = null; + private JComboBox _distUnitsDropdown = null; // Formatter private NumberFormat _distanceFormatter = NumberFormat.getInstance(); @@ -80,40 +71,21 @@ public class DetailsDisplay extends GenericDisplay private static final String LABEL_RANGE_DESCENT = ", " + I18nManager.getText("details.range.descent") + ": "; private static String LABEL_POINT_ALTITUDE_UNITS = null; private static int LABEL_POINT_ALTITUDE_FORMAT = Altitude.FORMAT_NONE; - // scrollbar interval - private static final int SCROLLBAR_INTERVAL = 50; /** * Constructor - * @param inApp App object for callbacks * @param inTrackInfo Track info object */ - public DetailsDisplay(App inApp, TrackInfo inTrackInfo) + public DetailsDisplay(TrackInfo inTrackInfo) { super(inTrackInfo); - _app = inApp; setLayout(new BorderLayout()); JPanel mainPanel = new JPanel(); mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS)); mainPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3)); - // Track details panel - JPanel trackDetailsPanel = new JPanel(); - trackDetailsPanel.setLayout(new BoxLayout(trackDetailsPanel, BoxLayout.Y_AXIS)); - trackDetailsPanel.setBorder(BorderFactory.createCompoundBorder( - BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3)) - ); - JLabel trackDetailsLabel = new JLabel(I18nManager.getText("details.trackdetails")); - Font biggerFont = trackDetailsLabel.getFont(); - biggerFont = biggerFont.deriveFont(Font.BOLD, biggerFont.getSize2D() + 2.0f); - trackDetailsLabel.setFont(biggerFont); - trackDetailsPanel.add(trackDetailsLabel); - _trackpointsLabel = new JLabel(I18nManager.getText("details.notrack")); - trackDetailsPanel.add(_trackpointsLabel); - _filenameLabel = new JLabel(""); - trackDetailsPanel.add(_filenameLabel); - + // Point details panel JPanel pointDetailsPanel = new JPanel(); pointDetailsPanel.setLayout(new BoxLayout(pointDetailsPanel, BoxLayout.Y_AXIS)); @@ -121,6 +93,8 @@ public class DetailsDisplay extends GenericDisplay 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); _indexLabel = new JLabel(I18nManager.getText("details.nopointselection")); @@ -133,163 +107,111 @@ public class DetailsDisplay extends GenericDisplay 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); - // Scroll bar - _scroller = new JScrollBar(JScrollBar.HORIZONTAL, 0, SCROLLBAR_INTERVAL, 0, 100); - _scroller.addAdjustmentListener(new AdjustmentListener() { - public void adjustmentValueChanged(AdjustmentEvent e) - { - selectPoint(e.getValue()); - } - }); - _scroller.setEnabled(false); - - // Button panel - JPanel buttonPanel = new JPanel(); - buttonPanel.setLayout(new GridLayout(2, 2, 3, 3)); - _startRangeButton = new JButton(I18nManager.getText("button.startrange")); - _startRangeButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - _trackInfo.getSelection().selectRangeStart(); - } - }); - _startRangeButton.setEnabled(false); - buttonPanel.add(_startRangeButton); - _endRangeButton = new JButton(I18nManager.getText("button.endrange")); - _endRangeButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - _trackInfo.getSelection().selectRangeEnd(); - } - }); - _endRangeButton.setEnabled(false); - buttonPanel.add(_endRangeButton); - _deletePointButton = new JButton(I18nManager.getText("button.deletepoint")); - _deletePointButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - _app.deleteCurrentPoint(); - } - }); - _deletePointButton.setEnabled(false); - buttonPanel.add(_deletePointButton); - _deleteRangeButton = new JButton(I18nManager.getText("button.deleterange")); - _deleteRangeButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - _app.deleteSelectedRange(); - } - }); - _deleteRangeButton.setEnabled(false); - buttonPanel.add(_deleteRangeButton); - buttonPanel.setAlignmentX(Component.LEFT_ALIGNMENT); - // range details panel - JPanel otherDetailsPanel = new JPanel(); - otherDetailsPanel.setLayout(new BoxLayout(otherDetailsPanel, BoxLayout.Y_AXIS)); - otherDetailsPanel.setBorder(BorderFactory.createCompoundBorder( + 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 otherDetailsLabel = new JLabel(I18nManager.getText("details.rangedetails")); - otherDetailsLabel.setFont(biggerFont); - otherDetailsPanel.add(otherDetailsLabel); + JLabel rangeDetailsLabel = new JLabel(I18nManager.getText("details.rangedetails")); + rangeDetailsLabel.setFont(biggerFont); + rangeDetailsPanel.add(rangeDetailsLabel); _rangeLabel = new JLabel(I18nManager.getText("details.norangeselection")); - otherDetailsPanel.add(_rangeLabel); + rangeDetailsPanel.add(_rangeLabel); _distanceLabel = new JLabel(""); - otherDetailsPanel.add(_distanceLabel); + rangeDetailsPanel.add(_distanceLabel); _durationLabel = new JLabel(""); - otherDetailsPanel.add(_durationLabel); + rangeDetailsPanel.add(_durationLabel); + _aveSpeedLabel = new JLabel(""); + rangeDetailsPanel.add(_aveSpeedLabel); _altRangeLabel = new JLabel(""); - otherDetailsPanel.add(_altRangeLabel); + rangeDetailsPanel.add(_altRangeLabel); _updownLabel = new JLabel(""); - otherDetailsPanel.add(_updownLabel); - otherDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT); + rangeDetailsPanel.add(_updownLabel); + rangeDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT); - // add the main panel at the top - add(mainPanel, BorderLayout.NORTH); - // add the slider, point details, and the other details to the main panel - mainPanel.add(buttonPanel); - mainPanel.add(Box.createVerticalStrut(5)); - mainPanel.add(_scroller); + // 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); + _photoLabel = new JLabel(I18nManager.getText("details.nophoto")); + photoDetailsPanel.add(_photoLabel); + _photoConnectedLabel = new JLabel(""); + photoDetailsPanel.add(_photoConnectedLabel); + _photoThumbnail = new PhotoThumbnail(); + _photoThumbnail.setVisible(false); + _photoThumbnail.setPreferredSize(new Dimension(100, 100)); + photoDetailsPanel.add(_photoThumbnail); + + // add the details panels to the main panel + mainPanel.add(pointDetailsPanel); mainPanel.add(Box.createVerticalStrut(5)); - mainPanel.add(trackDetailsPanel); + mainPanel.add(rangeDetailsPanel); mainPanel.add(Box.createVerticalStrut(5)); - mainPanel.add(pointDetailsPanel); + mainPanel.add(photoDetailsPanel); mainPanel.add(Box.createVerticalStrut(5)); - mainPanel.add(otherDetailsPanel); + // add the main panel at the top + add(mainPanel, BorderLayout.NORTH); - // Add units selection + // Add format, units selection JPanel lowerPanel = new JPanel(); - lowerPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); - lowerPanel.add(new JLabel(I18nManager.getText("details.distanceunits") + ": ")); + lowerPanel.setLayout(new BoxLayout(lowerPanel, BoxLayout.Y_AXIS)); + JLabel coordFormatLabel = new JLabel(I18nManager.getText("details.coordformat") + ": "); + coordFormatLabel.setAlignmentX(Component.LEFT_ALIGNMENT); + 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.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) + { + dataUpdated(DataSubscriber.UNITS_CHANGED); + } + }); + lowerPanel.add(_coordFormatDropdown); + _coordFormatDropdown.setAlignmentX(Component.LEFT_ALIGNMENT); + 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")}; - _unitsDropdown = new JComboBox(distUnits); - _unitsDropdown.addActionListener(new ActionListener() { + _distUnitsDropdown = new JComboBox(distUnits); + _distUnitsDropdown.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - dataUpdated(); + dataUpdated(DataSubscriber.UNITS_CHANGED); } }); - lowerPanel.add(_unitsDropdown); + lowerPanel.add(_distUnitsDropdown); + _distUnitsDropdown.setAlignmentX(Component.LEFT_ALIGNMENT); add(lowerPanel, BorderLayout.SOUTH); } - /** - * Select the specified point - * @param inValue value to select - */ - private void selectPoint(int inValue) - { - if (_track != null && !_ignoreScrollEvents) - { - _trackInfo.getSelection().selectPoint(inValue); - } - } - - /** * Notification that Track has been updated + * @param inUpdateType byte to specify what has been updated */ - public void dataUpdated() + public void dataUpdated(byte inUpdateType) { - // Update track data - if (_track == null || _track.getNumPoints() <= 0) - { - _trackpointsLabel.setText(I18nManager.getText("details.notrack")); - _filenameLabel.setText(""); - } - else - { - _trackpointsLabel.setText(I18nManager.getText("details.track.points") + ": " - + _track.getNumPoints()); - int numFiles = _trackInfo.getFileInfo().getNumFiles(); - if (numFiles == 1) - { - _filenameLabel.setText(I18nManager.getText("details.track.file") + ": " - + _trackInfo.getFileInfo().getFilename()); - } - else if (numFiles > 1) - { - _filenameLabel.setText(I18nManager.getText("details.track.numfiles") + ": " - + numFiles); - } - else _filenameLabel.setText(""); - } - // Update current point data, if any 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")); @@ -304,17 +226,35 @@ public class DetailsDisplay extends GenericDisplay _indexLabel.setText(LABEL_POINT_SELECTED1 + (currentPointIndex+1) + " " + I18nManager.getText("details.index.of") + " " + _track.getNumPoints()); - _latLabel.setText(LABEL_POINT_LATITUDE + currentPoint.getLatitude().output(Coordinate.FORMAT_NONE)); - _longLabel.setText(LABEL_POINT_LONGITUDE + currentPoint.getLongitude().output(Coordinate.FORMAT_NONE)); + _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())): "")); 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 < 100) { + 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.getFieldValue(Field.WAYPT_NAME); + } + String name = currentPoint.getWaypointName(); if (name != null && !name.equals("")) { _nameLabel.setText(LABEL_POINT_WAYPOINTNAME + name); @@ -322,30 +262,6 @@ public class DetailsDisplay extends GenericDisplay else _nameLabel.setText(""); } - // Update scroller settings - _ignoreScrollEvents = true; - if (_track == null || _track.getNumPoints() < 2) - { - // careful to avoid event loops here - // _scroller.setValue(0); - _scroller.setEnabled(false); - } - else - { - _scroller.setMaximum(_track.getNumPoints() + SCROLLBAR_INTERVAL); - if (currentPointIndex >= 0) - _scroller.setValue(currentPointIndex); - _scroller.setEnabled(true); - } - _ignoreScrollEvents = false; - - // Update button panel - boolean hasPoint = (_track != null && currentPointIndex >= 0); - _startRangeButton.setEnabled(hasPoint); - _endRangeButton.setEnabled(hasPoint); - _deletePointButton.setEnabled(hasPoint); - _deleteRangeButton.setEnabled(selection.hasRangeSelected()); - // Update range details if (_track == null || !selection.hasRangeSelected()) { @@ -360,18 +276,16 @@ public class DetailsDisplay extends GenericDisplay _rangeLabel.setText(LABEL_RANGE_SELECTED1 + (selection.getStart()+1) + " " + I18nManager.getText("details.range.to") + " " + (selection.getEnd()+1)); - if (_unitsDropdown.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")); - if (selection.getNumSeconds() > 0) + _distanceLabel.setText(LABEL_RANGE_DISTANCE + roundedNumber(selection.getDistance(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); + } + else { _durationLabel.setText(""); + _aveSpeedLabel.setText(""); + } String altUnitsLabel = getAltitudeUnitsLabel(selection.getAltitudeFormat()); IntegerRange altRange = selection.getAltitudeRange(); if (altRange.getMinimum() >= 0 && altRange.getMaximum() >= 0) @@ -389,6 +303,26 @@ public class DetailsDisplay extends GenericDisplay _updownLabel.setText(""); } } + // show photo details and thumbnail + Photo currentPhoto = _trackInfo.getPhotoList().getPhoto(_trackInfo.getSelection().getCurrentPhotoIndex()); + if (_track == null || ( (currentPoint == null || currentPoint.getPhoto() == null) && currentPhoto == null)) + { + // no photo, hide details + _photoLabel.setText(I18nManager.getText("details.nophoto")); + _photoConnectedLabel.setText(""); + _photoThumbnail.setVisible(false); + } + else + { + if (currentPhoto == null) {currentPhoto = currentPoint.getPhoto();} + _photoLabel.setText(I18nManager.getText("details.photofile") + ": " + currentPhoto.getFile().getName()); + _photoConnectedLabel.setText(I18nManager.getText("details.photo.connected") + ": " + + (currentPhoto.getCurrentStatus() == PhotoStatus.NOT_CONNECTED ? + I18nManager.getText("dialog.about.no"):I18nManager.getText("dialog.about.yes"))); + _photoThumbnail.setVisible(true); + _photoThumbnail.setPhoto(currentPhoto); + } + _photoThumbnail.repaint(); } @@ -408,6 +342,30 @@ public class DetailsDisplay extends GenericDisplay } + /** + * Construct an appropriate coordinate label using the selected format + * @param inPrefix prefix of label + * @param inCoordinate coordinate + * @param inFormat index of format selection dropdown + * @return language-sensitive string + */ + private static String makeCoordinateLabel(String inPrefix, Coordinate inCoordinate, int inFormat) + { + String coord = null; + switch (inFormat) { + case 1: // degminsec + coord = inCoordinate.output(Coordinate.FORMAT_DEG_MIN_SEC); break; + case 2: // degmin + coord = inCoordinate.output(Coordinate.FORMAT_DEG_MIN); break; + case 3: // degrees + coord = inCoordinate.output(Coordinate.FORMAT_DEG); break; + default: // just as it was + coord = inCoordinate.output(Coordinate.FORMAT_NONE); + } + return inPrefix + coord; + } + + /** * Build a String to describe a time duration * @param inNumSecs number of seconds @@ -421,17 +379,19 @@ public class DetailsDisplay extends GenericDisplay + " " + (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;