import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.TimeZone;
import javax.swing.BorderFactory;
import javax.swing.Box;
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;
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;
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;
private JPanel _playAudioPanel = null;
// Units
- private JComboBox _coordFormatDropdown = null;
- private JComboBox _distUnitsDropdown = null;
+ 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") + ": ";
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(_nameLabel);
_typeLabel = new JLabel("");
pointDetailsPanel.add(_typeLabel);
+ _filenameLabel = new JLabel("");
+ pointDetailsPanel.add(_filenameLabel);
pointDetailsPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
// range details panel
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)
{
unitsLabel.setAlignmentX(Component.LEFT_ALIGNMENT);
lowerPanel.add(unitsLabel);
// Make dropdown for distance units
- _distUnitsDropdown = new JComboBox();
+ _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()));
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
{
(LABEL_POINT_ALTITUDE + currentPoint.getAltitude().getValue(altUnit) + " " +
I18nManager.getText(altUnit.getShortnameKey()))
: "");
- if (currentPoint.hasTimestamp()) {
- _timeLabel.setText(LABEL_POINT_TIMESTAMP + currentPoint.getTimestamp().getText());
- _timeLabel.setToolTipText(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("");
- _timeLabel.setToolTipText("");
+ else
+ {
+ _ptDateLabel.setText("");
+ _ptTimeLabel.setText("");
}
// Maybe the point has a description?
String pointDesc = currentPoint.getFieldValue(Field.DESCRIPTION);
_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
_rangeLabel.setText(LABEL_RANGE_SELECTED
+ (selection.getStart()+1) + " " + I18nManager.getText("details.range.to")
+ " " + (selection.getEnd()+1));
- _distanceLabel.setText(LABEL_RANGE_DISTANCE + DisplayUtils.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") + ": "
- + DisplayUtils.roundedNumber(selection.getDistance()/selection.getNumSeconds()*3600.0) + " " + speedUnitsStr);
+ + DisplayUtils.roundedNumber(selection.getMovingDistance()/numMovingSeconds*3600.0) + " " + speedUnitsStr);
}
else {
_durationLabel.setText("");
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")));
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") + ": "
{
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;
}
/**
projects / GpsPrune.git / blobdiff