X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2Fgpsies%2FTrackListModel.java;h=298578c4330c5dab8eccf8f86da4cff19b33187f;hb=0a2480df5845e2d7190dfdec9b2653b1609e853d;hp=3a7326f647409b131d70964ad48279ac086ab275;hpb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa;p=GpsPrune.git

diff --git a/tim/prune/function/gpsies/TrackListModel.java b/tim/prune/function/gpsies/TrackListModel.java
index 3a7326f..298578c 100644
--- a/tim/prune/function/gpsies/TrackListModel.java
+++ b/tim/prune/function/gpsies/TrackListModel.java
@@ -7,7 +7,8 @@ import javax.swing.table.AbstractTableModel;
 
 import tim.prune.I18nManager;
 import tim.prune.config.Config;
-import tim.prune.data.Distance;
+import tim.prune.data.Unit;
+import tim.prune.function.search.SearchResult;
 
 /**
  * Model for list of tracks from gpsies.com
@@ -15,7 +16,7 @@ import tim.prune.data.Distance;
 public class TrackListModel extends AbstractTableModel
 {
 	/** List of tracks */
-	private ArrayList<GpsiesTrack> _trackList = null;
+	private ArrayList<SearchResult> _trackList = null;
 	/** Column heading for track name */
 	private String _nameColLabel = null;
 	/** Column heading for length */
@@ -57,6 +58,12 @@ public class TrackListModel extends AbstractTableModel
 		return _trackList.size();
 	}
 
+	/** @return true if there are no rows */
+	public boolean isEmpty()
+	{
+		return getRowCount() == 0;
+	}
+
 	/**
 	 * @param inColNum column number
 	 * @return column label for given column
@@ -74,35 +81,39 @@ public class TrackListModel extends AbstractTableModel
 	 */
 	public Object getValueAt(int inRowNum, int inColNum)
 	{
-		GpsiesTrack track = _trackList.get(inRowNum);
+		SearchResult track = _trackList.get(inRowNum);
 		if (inColNum == 0) {return track.getTrackName();}
 		double lengthM = track.getLength();
-		if (Config.getConfigBoolean(Config.KEY_METRIC_UNITS)) {
-			return _distanceFormatter.format(lengthM / 1000.0) + " " + I18nManager.getText("units.kilometres.short");
-		}
-		// must be imperial
-		return _distanceFormatter.format(Distance.convertMetresToMiles(lengthM))
-			+ " " + I18nManager.getText("units.miles.short");
+		// convert to current distance units
+		Unit distUnit = Config.getUnitSet().getDistanceUnit();
+		double length = lengthM * distUnit.getMultFactorFromStd();
+		// Make text
+		return _distanceFormatter.format(length) + " " + I18nManager.getText(distUnit.getShortnameKey());
 	}
 
 	/**
 	 * Add a list of tracks to this model
 	 * @param inList list of tracks to add
 	 */
-	public void addTracks(ArrayList<GpsiesTrack> inList)
+	public void addTracks(ArrayList<SearchResult> inList)
 	{
-		if (_trackList == null) {_trackList = new ArrayList<GpsiesTrack>();}
+		if (_trackList == null) {_trackList = new ArrayList<SearchResult>();}
+		final int prevCount = _trackList.size();
 		if (inList != null && inList.size() > 0) {
 			_trackList.addAll(inList);
 		}
-		fireTableDataChanged();
+		final int updatedCount = _trackList.size();
+		if (prevCount <= 0)
+			fireTableDataChanged();
+		else
+			fireTableRowsInserted(prevCount, updatedCount-1);
 	}
 
 	/**
 	 * @param inRowNum row number from 0
 	 * @return track object for this row
 	 */
-	public GpsiesTrack getTrack(int inRowNum)
+	public SearchResult getTrack(int inRowNum)
 	{
 		return _trackList.get(inRowNum);
 	}