X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FSelection.java;h=f5c41ffd91f6015d8d4762e546fe8385c5dadc8e;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hp=cbfb3504b4049f1597ca4dba8337102dc7ff5385;hpb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;p=GpsPrune.git

diff --git a/tim/prune/data/Selection.java b/tim/prune/data/Selection.java
index cbfb350..f5c41ff 100644
--- a/tim/prune/data/Selection.java
+++ b/tim/prune/data/Selection.java
@@ -12,11 +12,11 @@ public class Selection
 	private Track _track = null;
 	private int _currentPoint = -1;
 	private boolean _valid = false;
+	private int _prevNumPoints = 0;
 	private int _startIndex = -1, _endIndex = -1;
 	private int _currentPhotoIndex = -1;
-	private IntegerRange _altitudeRange = null;
-	private int _climb = -1, _descent = -1;
-	private Altitude.Format _altitudeFormat = Altitude.Format.NO_FORMAT;
+	private int _currentAudioIndex = -1;
+	private AltitudeRange _altitudeRange = null;
 	private long _totalSeconds = 0L, _movingSeconds = 0L;
 	private double _angDistance = -1.0, _angMovingDistance = -1.0;
 	private int _numSegments = 0;
@@ -64,22 +64,23 @@ public class Selection
 	 */
 	private void recalculate()
 	{
-		_altitudeFormat = Altitude.Format.NO_FORMAT;
 		_numSegments = 0;
-		if (_track.getNumPoints() > 0 && hasRangeSelected())
+		final int numPoints = _track.getNumPoints();
+		// Recheck if the number of points has changed
+		if (numPoints != _prevNumPoints) {
+			_prevNumPoints = numPoints;
+			check();
+		}
+		if (numPoints > 0 && hasRangeSelected())
 		{
-			_altitudeRange = new IntegerRange();
-			_climb = 0;
-			_descent = 0;
+			_altitudeRange = new AltitudeRange();
 			Altitude altitude = null;
 			Timestamp time = null, startTime = null, endTime = null;
 			Timestamp previousTime = null;
 			DataPoint lastPoint = null, currPoint = null;
 			_angDistance = 0.0; _angMovingDistance = 0.0;
 			_totalSeconds = 0L; _movingSeconds = 0L;
-			int altValue = 0;
-			int lastAltValue = 0;
-			boolean foundAlt = false;
+			// Loop over points in selection
 			for (int i=_startIndex; i<=_endIndex; i++)
 			{
 				currPoint = _track.getPoint(i);
@@ -87,19 +88,7 @@ public class Selection
 				// Ignore waypoints in altitude calculations
 				if (!currPoint.isWaypoint() && altitude.isValid())
 				{
-					altValue = altitude.getValue(_altitudeFormat);
-					if (_altitudeFormat == Altitude.Format.NO_FORMAT)
-						_altitudeFormat = altitude.getFormat();
-					_altitudeRange.addValue(altValue);
-					if (foundAlt)
-					{
-						if (altValue > lastAltValue)
-							_climb += (altValue - lastAltValue);
-						else
-							_descent += (lastAltValue - altValue);
-					}
-					lastAltValue = altValue;
-					foundAlt = true;
+					_altitudeRange.addValue(altitude);
 				}
 				// Store the first and last timestamp in the range
 				time = currPoint.getTimestamp();
@@ -159,44 +148,16 @@ public class Selection
 		return _endIndex;
 	}
 
-
-	/**
-	 * @return the altitude format, ie feet or metres
-	 */
-	public Altitude.Format getAltitudeFormat()
-	{
-		return _altitudeFormat;
-	}
-
 	/**
 	 * @return altitude range
 	 */
-	public IntegerRange getAltitudeRange()
+	public AltitudeRange getAltitudeRange()
 	{
 		if (!_valid) recalculate();
 		return _altitudeRange;
 	}
 
 
-	/**
-	 * @return climb
-	 */
-	public int getClimb()
-	{
-		if (!_valid) recalculate();
-		return _climb;
-	}
-
-	/**
-	 * @return descent
-	 */
-	public int getDescent()
-	{
-		if (!_valid) recalculate();
-		return _descent;
-	}
-
-
 	/**
 	 * @return number of seconds spanned by selection
 	 */
@@ -216,21 +177,19 @@ public class Selection
 	}
 
 	/**
-	 * @param inUnits distance units to use, from class Distance
 	 * @return distance of Selection in specified units
 	 */
-	public double getDistance(Distance.Units inUnits)
+	public double getDistance()
 	{
-		return Distance.convertRadiansToDistance(_angDistance, inUnits);
+		return Distance.convertRadiansToDistance(_angDistance);
 	}
 
 	/**
-	 * @param inUnits distance units to use, from class Distance
-	 * @return moving distance of Selection in specified units
+	 * @return moving distance of Selection in current units
 	 */
-	public double getMovingDistance(Distance.Units inUnits)
+	public double getMovingDistance()
 	{
-		return Distance.convertRadiansToDistance(_angMovingDistance, inUnits);
+		return Distance.convertRadiansToDistance(_angMovingDistance);
 	}
 
 	/**
@@ -242,13 +201,14 @@ public class Selection
 	}
 
 	/**
-	 * Clear selected point, range and photo
+	 * Clear selected point, range, photo and audio
 	 */
 	public void clearAll()
 	{
 		_currentPoint = -1;
 		selectRange(-1, -1);
 		_currentPhotoIndex = -1;
+		_currentAudioIndex = -1;
 		check();
 	}
 
@@ -373,13 +333,15 @@ public class Selection
 
 	/**
 	 * Select the specified photo and point
-	 * @param inPhotoIndex index of selected photo in PhotoList
 	 * @param inPointIndex index of selected point
+	 * @param inPhotoIndex index of selected photo in PhotoList
+	 * @param inAudioIndex index of selected audio item
 	 */
-	public void selectPhotoAndPoint(int inPhotoIndex, int inPointIndex)
+	public void selectPointPhotoAudio(int inPointIndex, int inPhotoIndex, int inAudioIndex)
 	{
-		_currentPhotoIndex = inPhotoIndex;
 		_currentPoint = inPointIndex;
+		_currentPhotoIndex = inPhotoIndex;
+		_currentAudioIndex = inAudioIndex;
 		check();
 	}
 
@@ -392,35 +354,40 @@ public class Selection
 		return _currentPhotoIndex;
 	}
 
+	/**
+	 * @return currently selected audio index
+	 */
+	public int getCurrentAudioIndex()
+	{
+		return _currentAudioIndex;
+	}
+
 	/**
 	 * Check that the selection still makes sense
 	 * and fire update message to listeners
 	 */
 	private void check()
 	{
-		if (_track != null)
+		if (_track != null && _track.getNumPoints() > 0)
 		{
-			if (_track.getNumPoints() > 0)
+			int maxIndex = _track.getNumPoints() - 1;
+			if (_currentPoint > maxIndex)
 			{
-				int maxIndex = _track.getNumPoints() - 1;
-				if (_currentPoint > maxIndex)
-				{
-					_currentPoint = maxIndex;
-				}
-				if (_endIndex > maxIndex)
-				{
-					_endIndex = maxIndex;
-				}
-				if (_startIndex > maxIndex)
-				{
-					_startIndex = maxIndex;
-				}
+				_currentPoint = maxIndex;
 			}
-			else
+			if (_endIndex > maxIndex)
 			{
-				// track is empty, clear selections
-				_currentPoint = _startIndex = _endIndex = -1;
+				_endIndex = maxIndex;
 			}
+			if (_startIndex > maxIndex)
+			{
+				_startIndex = maxIndex;
+			}
+		}
+		else
+		{
+			// track is empty, clear selections
+			_currentPoint = _startIndex = _endIndex = -1;
 		}
 		UpdateMessageBroker.informSubscribers(DataSubscriber.SELECTION_CHANGED);
 	}