X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fsave%2FFileSaver.java;h=1e199d9e7bb387ee6dafdbdb903772fb4d1ff9ac;hb=0a2480df5845e2d7190dfdec9b2653b1609e853d;hp=debe0e799bb1134416b950ca29700c7c111d7143;hpb=649c5da6ee1bbc590699e11a92316ece2ea8512d;p=GpsPrune.git diff --git a/tim/prune/save/FileSaver.java b/tim/prune/save/FileSaver.java index debe0e7..1e199d9 100644 --- a/tim/prune/save/FileSaver.java +++ b/tim/prune/save/FileSaver.java @@ -35,7 +35,6 @@ import tim.prune.App; 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.Field; @@ -43,6 +42,8 @@ import tim.prune.data.FieldList; import tim.prune.data.RecentFile; import tim.prune.data.Timestamp; import tim.prune.data.Track; +import tim.prune.data.Unit; +import tim.prune.data.UnitSetLibrary; import tim.prune.load.GenericFileFilter; import tim.prune.load.OneCharDocument; @@ -72,8 +73,8 @@ public class FileSaver private static final int[] FORMAT_COORDS = {Coordinate.FORMAT_NONE, Coordinate.FORMAT_DEG_MIN_SEC, Coordinate.FORMAT_DEG_MIN, Coordinate.FORMAT_DEG}; - private static final Altitude.Format[] FORMAT_ALTS = {Altitude.Format.NO_FORMAT, Altitude.Format.METRES, Altitude.Format.FEET}; - private static final int[] FORMAT_TIMES = {Timestamp.FORMAT_ORIGINAL, Timestamp.FORMAT_LOCALE, Timestamp.FORMAT_ISO_8601}; + private static final Unit[] UNIT_ALTS = {null, UnitSetLibrary.UNITS_METRES, UnitSetLibrary.UNITS_FEET}; + private static final Timestamp.Format[] FORMAT_TIMES = {Timestamp.Format.ORIGINAL, Timestamp.Format.LOCALE, Timestamp.Format.ISO8601}; /** @@ -101,17 +102,25 @@ public class FileSaver _dialog.getContentPane().add(makeDialogComponents()); _dialog.pack(); } + // Has the track got media? + final boolean hasMedia = _app.getTrackInfo().getPhotoList().hasCorrelatedPhotos() + || _app.getTrackInfo().getAudioList().hasCorrelatedAudios(); // Check field list Track track = _app.getTrackInfo().getTrack(); FieldList fieldList = track.getFieldList(); int numFields = fieldList.getNumFields(); - _model = new FieldSelectionTableModel(numFields); + _model = new FieldSelectionTableModel(numFields + (hasMedia ? 1 : 0)); for (int i=0; i