X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FTrackInfo.java;h=00d658828d38bf70e912d640caf85e4f7b824991;hb=0a2480df5845e2d7190dfdec9b2653b1609e853d;hp=58344142d390faf734df76edbf8fc557d5649c8e;hpb=649c5da6ee1bbc590699e11a92316ece2ea8512d;p=GpsPrune.git

diff --git a/tim/prune/data/TrackInfo.java b/tim/prune/data/TrackInfo.java
index 5834414..00d6588 100644
--- a/tim/prune/data/TrackInfo.java
+++ b/tim/prune/data/TrackInfo.java
@@ -184,21 +184,6 @@ public class TrackInfo
 		return numAudiosAdded;
 	}
 
-	/**
-	 * Delete the currently selected range of points
-	 * @return true if successful
-	 */
-	public boolean deleteRange()
-	{
-		int startSel = _selection.getStart();
-		int endSel = _selection.getEnd();
-		boolean answer = _track.deleteRange(startSel, endSel);
-		// clear range selection
-		_selection.modifyRangeDeleted();
-		return answer;
-	}
-
-
 	/**
 	 * Delete the currently selected point
 	 * @return true if point deleted
@@ -287,12 +272,14 @@ public class TrackInfo
 
 	/**
 	 * Delete all the points which have been marked for deletion
+	 * @param inSplitSegments true to split segments at deleted points
 	 * @return number of points deleted
 	 */
-	public int deleteMarkedPoints()
+	public int deleteMarkedPoints(boolean inSplitSegments)
 	{
-		int numDeleted = _track.deleteMarkedPoints();
-		if (numDeleted > 0) {
+		int numDeleted = _track.deleteMarkedPoints(inSplitSegments);
+		if (numDeleted > 0)
+		{
 			_selection.clearAll();
 			UpdateMessageBroker.informSubscribers();
 		}
@@ -335,20 +322,6 @@ public class TrackInfo
 		return true;
 	}
 
-	/**
-	 * Interpolate extra points between two selected ones
-	 * @param inNumPoints num points to insert
-	 * @return true if successful
-	 */
-	public boolean interpolate(int inNumPoints)
-	{
-		boolean success = _track.interpolate(_selection.getStart(), inNumPoints);
-		if (success) {
-			_selection.selectRangeEnd(_selection.getEnd() + inNumPoints);
-		}
-		return success;
-	}
-
 
 	/**
 	 * Average selected points to create a new one
@@ -453,11 +426,13 @@ public class TrackInfo
 		// Has the new point got an audio clip?
 		DataPoint selectedPoint = _track.getPoint(pointIndex);
 		int audioIndex = _selection.getCurrentAudioIndex();
-		if (selectedPoint != null) {
-			if (selectedPoint.getAudio() != null) audioIndex = _audioList.getAudioIndex(selectedPoint.getAudio());
+		if (selectedPoint != null && selectedPoint.getAudio() != null) {
+			// New point has an audio, so select it
+			audioIndex = _audioList.getAudioIndex(selectedPoint.getAudio());
 		}
-		else {
-			if (selectedPoint != currPoint && currPoint.getAudio() != null) {audioIndex = -1;}
+		else if (currPoint != null && selectedPoint != currPoint && currPoint.getAudio() != null) {
+			// Old point had an audio, so deselect it
+			audioIndex = -1;
 		}
 		// give to selection object
 		_selection.selectPointPhotoAudio(pointIndex, inPhotoIndex, audioIndex);
@@ -496,11 +471,13 @@ public class TrackInfo
 		// Has the new point got a photo?
 		DataPoint selectedPoint = _track.getPoint(pointIndex);
 		int photoIndex = _selection.getCurrentPhotoIndex();
-		if (selectedPoint != null) {
-			if (selectedPoint.getPhoto() != null) photoIndex = _photoList.getPhotoIndex(selectedPoint.getPhoto());
+		if (selectedPoint != null && selectedPoint.getPhoto() != null) {
+			// New point has a photo, so select it
+			photoIndex = _photoList.getPhotoIndex(selectedPoint.getPhoto());
 		}
-		else {
-			if (selectedPoint != currPoint && currPoint.getPhoto() != null) {photoIndex = -1;}
+		else if (currPoint != null && selectedPoint != currPoint && currPoint.getPhoto() != null) {
+			// Old point had a photo, so deselect it
+			photoIndex = -1;
 		}
 		// give to selection object
 		_selection.selectPointPhotoAudio(pointIndex, photoIndex, inAudioIndex);