import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
+import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
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.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.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;
// Point details
private JLabel _indexLabel = null;
private JLabel _latLabel = null, _longLabel = null;
- private JLabel _altLabel = null, _nameLabel = null;
+ private JLabel _altLabel = null;
private JLabel _timeLabel = null, _speedLabel = null;
+ private JLabel _nameLabel = null, _typeLabel = null;
// Range details
private JLabel _rangeLabel = null;
- private JLabel _distanceLabel = null, _durationLabel = null;
+ private JLabel _distanceLabel = null;
+ private JLabel _durationLabel = null;
private JLabel _altRangeLabel = null, _updownLabel = null;
private JLabel _aveSpeedLabel = null;
// Photo details
private JLabel _photoLabel = null;
private PhotoThumbnail _photoThumbnail = null;
+ private JLabel _photoTimestampLabel = null;
private JLabel _photoConnectedLabel = null;
+ private JPanel _rotationButtons = null;
// Units
private JComboBox _coordFormatDropdown = null;
private NumberFormat _distanceFormatter = NumberFormat.getInstance();
// Cached labels
- private static final String LABEL_POINT_SELECTED1 = I18nManager.getText("details.index.selected") + ": ";
+ private static final String LABEL_POINT_SELECTED = I18nManager.getText("details.index.selected") + ": ";
private static final String LABEL_POINT_LATITUDE = I18nManager.getText("fieldname.latitude") + ": ";
private static final String LABEL_POINT_LONGITUDE = I18nManager.getText("fieldname.longitude") + ": ";
private static final String LABEL_POINT_ALTITUDE = I18nManager.getText("fieldname.altitude") + ": ";
private static final String LABEL_POINT_TIMESTAMP = I18nManager.getText("fieldname.timestamp") + ": ";
private static final String LABEL_POINT_WAYPOINTNAME = I18nManager.getText("fieldname.waypointname") + ": ";
- private static final String LABEL_RANGE_SELECTED1 = I18nManager.getText("details.range.selected") + ": ";
+ private static final String LABEL_POINT_WAYPOINTTYPE = I18nManager.getText("fieldname.waypointtype") + ": ";
+ 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_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 int LABEL_POINT_ALTITUDE_FORMAT = Altitude.FORMAT_NONE;
+ private static Altitude.Format LABEL_POINT_ALTITUDE_FORMAT = Altitude.Format.NO_FORMAT;
/**
pointDetailsPanel.add(_speedLabel);
_nameLabel = new JLabel("");
pointDetailsPanel.add(_nameLabel);
+ _typeLabel = new JLabel("");
+ pointDetailsPanel.add(_typeLabel);
pointDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
// range details panel
photoDetailsPanel.add(photoDetailsLabel);
_photoLabel = new JLabel(I18nManager.getText("details.nophoto"));
photoDetailsPanel.add(_photoLabel);
+ _photoTimestampLabel = new JLabel("");
+ photoDetailsPanel.add(_photoTimestampLabel);
_photoConnectedLabel = new JLabel("");
photoDetailsPanel.add(_photoConnectedLabel);
_photoThumbnail = new PhotoThumbnail();
_photoThumbnail.setVisible(false);
_photoThumbnail.setPreferredSize(new Dimension(100, 100));
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);
+ _rotationButtons = new JPanel();
+ _rotationButtons.add(rotLeft);
+ _rotationButtons.add(rotRight);
+ _rotationButtons.setAlignmentX(Component.LEFT_ALIGNMENT);
+ _rotationButtons.setVisible(false);
+ photoDetailsPanel.add(_rotationButtons);
// add the details panels to the main panel
mainPanel.add(pointDetailsPanel);
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);}
_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);
Selection selection = _trackInfo.getSelection();
int currentPointIndex = selection.getCurrentPointIndex();
_speedLabel.setText("");
- int distUnits = _distUnitsDropdown.getSelectedIndex()==0?Distance.UNITS_KILOMETRES:Distance.UNITS_MILES;
+ 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");
if (_track == null || currentPoint == null)
_altLabel.setText("");
_timeLabel.setText("");
_nameLabel.setText("");
+ _typeLabel.setText("");
}
else
{
- _indexLabel.setText(LABEL_POINT_SELECTED1
+ _indexLabel.setText(LABEL_POINT_SELECTED
+ (currentPointIndex+1) + " " + I18nManager.getText("details.index.of")
+ " " + _track.getNumPoints());
_latLabel.setText(makeCoordinateLabel(LABEL_POINT_LATITUDE, currentPoint.getLatitude(), _coordFormatDropdown.getSelectedIndex()));
_longLabel.setText(makeCoordinateLabel(LABEL_POINT_LONGITUDE, currentPoint.getLongitude(), _coordFormatDropdown.getSelectedIndex()));
- _altLabel.setText(LABEL_POINT_ALTITUDE
- + (currentPoint.hasAltitude()?
- (currentPoint.getAltitude().getValue() + getAltitudeUnitsLabel(currentPoint.getAltitude().getFormat())):
- ""));
+ _altLabel.setText(currentPoint.hasAltitude()?
+ (LABEL_POINT_ALTITUDE + currentPoint.getAltitude().getValue() + getAltitudeUnitsLabel(currentPoint.getAltitude().getFormat()))
+ :"");
if (currentPoint.getTimestamp().isValid())
{
- if (currentPointIndex > 0 && currentPointIndex < (_trackInfo.getTrack().getNumPoints()-1)) {
+ 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()) {
+ 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) {
+ 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("details.speed") + ": " + speed);
+ _speedLabel.setText(I18nManager.getText("fieldname.speed") + ": " + speed);
}
}
}
else {
_timeLabel.setText("");
}
- String name = currentPoint.getWaypointName();
+ // 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("");
}
// Update range details
_durationLabel.setText("");
_altRangeLabel.setText("");
_updownLabel.setText("");
+ _aveSpeedLabel.setText("");
}
else
{
- _rangeLabel.setText(LABEL_RANGE_SELECTED1
+ _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.getNumSeconds() > 0) {
- _durationLabel.setText(LABEL_RANGE_DURATION + buildDurationString(selection.getNumSeconds()));
+ if (selection.getNumSeconds() > 0)
+ {
+ _durationLabel.setText(LABEL_RANGE_DURATION + DisplayUtils.buildDurationString(selection.getNumSeconds()));
_aveSpeedLabel.setText(I18nManager.getText("details.range.avespeed") + ": "
+ roundedNumber(selection.getDistance(distUnits)/selection.getNumSeconds()*3600.0) + " " + speedUnitsStr);
}
}
// show photo details and thumbnail
Photo currentPhoto = _trackInfo.getPhotoList().getPhoto(_trackInfo.getSelection().getCurrentPhotoIndex());
- if (_track == null || ( (currentPoint == null || currentPoint.getPhoto() == null) && currentPhoto == null))
+ if ((currentPoint == null || currentPoint.getPhoto() == null) && currentPhoto == null)
{
// no photo, hide details
_photoLabel.setText(I18nManager.getText("details.nophoto"));
+ _photoTimestampLabel.setText("");
_photoConnectedLabel.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") + ": "
- + (currentPhoto.getCurrentStatus() == PhotoStatus.NOT_CONNECTED ?
+ + (currentPhoto.getCurrentStatus() == Photo.Status.NOT_CONNECTED ?
I18nManager.getText("dialog.about.no"):I18nManager.getText("dialog.about.yes")));
_photoThumbnail.setVisible(true);
_photoThumbnail.setPhoto(currentPhoto);
+ _rotationButtons.setVisible(true);
+ if ((inUpdateType & DataSubscriber.PHOTOS_MODIFIED) > 0) {_photoThumbnail.refresh();}
}
_photoThumbnail.repaint();
}
* @param inFormat altitude format
* @return language-sensitive string
*/
- private static String getAltitudeUnitsLabel(int inFormat)
+ 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)
+ if (inFormat == Altitude.Format.METRES)
return " " + I18nManager.getText("units.metres.short");
return " " + I18nManager.getText("units.feet.short");
}
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
- * @return time as a string, days, hours, mins, secs as appropriate
- */
- private static String buildDurationString(long inNumSecs)
- {
- 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) + I18nManager.getText("display.range.time.hours");
- if (inNumSecs < 8640000L) return "" + (inNumSecs / 86400L) + I18nManager.getText("display.range.time.days");
- return "big";
+ // 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);
}
_distanceFormatter.setMinimumFractionDigits(numDigits);
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;
+ }
+
+ /**
+ * 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;
+ }
}
projects / GpsPrune.git / blobdiff