X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2FDetailsDisplay.java;h=ec68e162633dc66472138c20d6c1ac3a602c7303;hb=649c5da6ee1bbc590699e11a92316ece2ea8512d;hp=5e31a4e97aee5086ba60d184bc69e6e6d276d0be;hpb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;p=GpsPrune.git diff --git a/tim/prune/gui/DetailsDisplay.java b/tim/prune/gui/DetailsDisplay.java index 5e31a4e..ec68e16 100644 --- a/tim/prune/gui/DetailsDisplay.java +++ b/tim/prune/gui/DetailsDisplay.java @@ -3,6 +3,7 @@ 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; @@ -16,14 +17,17 @@ 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.DataSubscriber; import tim.prune.FunctionLibrary; import tim.prune.GenericFunction; import tim.prune.I18nManager; +import tim.prune.UpdateMessageBroker; import tim.prune.config.Config; import tim.prune.data.Altitude; +import tim.prune.data.AudioClip; import tim.prune.data.Coordinate; import tim.prune.data.DataPoint; import tim.prune.data.Distance; @@ -54,12 +58,23 @@ public class DetailsDisplay extends GenericDisplay private JLabel _aveSpeedLabel = null; // Photo details + private JPanel _photoDetailsPanel = null; private JLabel _photoLabel = 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 _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; @@ -80,6 +95,7 @@ public class DetailsDisplay extends GenericDisplay 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 final String LABEL_AUDIO_FILE = I18nManager.getText("details.audio.file") + ": "; private static String LABEL_POINT_ALTITUDE_UNITS = null; private static Altitude.Format LABEL_POINT_ALTITUDE_FORMAT = Altitude.Format.NO_FORMAT; @@ -96,18 +112,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(""); @@ -117,6 +126,7 @@ public class DetailsDisplay extends GenericDisplay _altLabel = new JLabel(""); pointDetailsPanel.add(_altLabel); _timeLabel = new JLabel(""); + _timeLabel.setMinimumSize(new Dimension(120, 10)); pointDetailsPanel.add(_timeLabel); _speedLabel = new JLabel(""); pointDetailsPanel.add(_speedLabel); @@ -127,14 +137,7 @@ public class DetailsDisplay extends GenericDisplay 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(""); @@ -150,40 +153,70 @@ 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); _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.add(_rotationButtons); + _photoDetailsPanel.setVisible(false); + + // audio details panel + _audioDetailsPanel = makeDetailsPanel("details.audiodetails", biggerFont); + _audioLabel = new JLabel(I18nManager.getText("details.noaudio")); + _audioDetailsPanel.add(_audioLabel); + _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); @@ -214,8 +247,8 @@ public class DetailsDisplay extends GenericDisplay _distUnitsDropdown.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - dataUpdated(DataSubscriber.UNITS_CHANGED); Config.setConfigBoolean(Config.KEY_METRIC_UNITS, _distUnitsDropdown.getSelectedIndex() == 0); + UpdateMessageBroker.informSubscribers(DataSubscriber.UNITS_CHANGED); } }); lowerPanel.add(_distUnitsDropdown); @@ -233,6 +266,7 @@ 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; @@ -342,6 +376,7 @@ 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) { @@ -349,23 +384,51 @@ public class DetailsDisplay extends GenericDisplay _photoLabel.setText(I18nManager.getText("details.nophoto")); _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()); + _photoTimestampLabel.setText(currentPhoto.hasTimestamp()?(LABEL_POINT_TIMESTAMP + currentPhoto.getTimestamp().getText()):""); + _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(); + + // 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")); + _audioTimestampLabel.setText(""); + _audioLengthLabel.setText(""); + _audioConnectedLabel.setText(""); + } + else + { + _audioLabel.setText(LABEL_AUDIO_FILE + currentAudio.getName()); + _audioTimestampLabel.setText(currentAudio.hasTimestamp()?(LABEL_POINT_TIMESTAMP + currentAudio.getTimestamp().getText()):""); + 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); } @@ -405,7 +468,12 @@ 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); } @@ -430,6 +498,44 @@ public class DetailsDisplay extends GenericDisplay return _distanceFormatter.format(inDist); } + /** + * Restrict the given coordinate to a limited number of decimal places for display + * @param inCoord coordinate string + * @return chopped string + */ + private static String restrictDP(String inCoord) + { + final int DECIMAL_PLACES = 7; + if (inCoord == null) return ""; + final int dotPos = Math.max(inCoord.lastIndexOf('.'), inCoord.lastIndexOf(',')); + if (dotPos >= 0) { + final int chopPos = dotPos + DECIMAL_PLACES; + if (chopPos < (inCoord.length()-1)) { + return inCoord.substring(0, chopPos); + } + } + return inCoord; + } + + /** + * 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)