X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fundo%2FUndoDeletePoint.java;h=beddfbf32588eec6a16a0657c6935f5878740ce4;hb=326f489e36aa7f235bc19409a57bf4955cd50f24;hp=4cc09b47f23aa752b1b362f515d1c27acb562bf5;hpb=d3679d647d57c2ee7376ddbf6def2d5b23c04307;p=GpsPrune.git

diff --git a/tim/prune/undo/UndoDeletePoint.java b/tim/prune/undo/UndoDeletePoint.java
index 4cc09b4..beddfbf 100644
--- a/tim/prune/undo/UndoDeletePoint.java
+++ b/tim/prune/undo/UndoDeletePoint.java
@@ -7,21 +7,31 @@ import tim.prune.data.TrackInfo;
 /**
  * Operation to undo a delete of a single point
  */
-public class UndoDeletePoint implements UndoOperation
+public class UndoDeletePoint extends UndoDeleteOperation
 {
 	private int _pointIndex = -1;
 	private DataPoint _point = null;
+	private int _photoIndex = -1;
+	private int _audioIndex = -1;
+	private boolean _segmentStart = false;
 
 
 	/**
 	 * Constructor
-	 * @param inIndex index number of point within track
+	 * @param inPointIndex index number of point within track
 	 * @param inPoint data point
+	 * @param inPhotoIndex index number of photo within photo list
+	 * @param inAudioIndex index number of audio within audio list
+	 * @param inSegmentStart true if following track point starts new segment
 	 */
-	public UndoDeletePoint(int inIndex, DataPoint inPoint)
+	public UndoDeletePoint(int inPointIndex, DataPoint inPoint, int inPhotoIndex, int inAudioIndex,
+		boolean inSegmentStart)
 	{
-		_pointIndex = inIndex;
+		_pointIndex = inPointIndex;
 		_point = inPoint;
+		_photoIndex = inPhotoIndex;
+		_audioIndex = inAudioIndex;
+		_segmentStart = inSegmentStart;
 	}
 
 
@@ -40,7 +50,7 @@ public class UndoDeletePoint implements UndoOperation
 
 	/**
 	 * Perform the undo operation on the given Track
-	 * @param inTrack Track object on which to perform the operation
+	 * @param inTrackInfo TrackInfo object on which to perform the operation
 	 */
 	public void performUndo(TrackInfo inTrackInfo) throws UndoException
 	{
@@ -49,6 +59,37 @@ public class UndoDeletePoint implements UndoOperation
 		{
 			throw new UndoException(getDescription());
 		}
-		// TODO: Reinsert photo into list if necessary
+		// Re-attach / Re-insert photo into list if necessary
+		if (_point.getPhoto() != null && _photoIndex > -1)
+		{
+			// Check if photo is still in list
+			if (!inTrackInfo.getPhotoList().contains(_point.getPhoto()))
+			{
+				// photo has been removed - need to reinsert
+				inTrackInfo.getPhotoList().addPhoto(_point.getPhoto(), _photoIndex);
+			}
+			// Ensure that photo is associated with point
+			if (_point.getPhoto().getDataPoint() != _point) {
+				_point.getPhoto().setDataPoint(_point);
+			}
+		}
+		// Re-add audio as well if necessary
+		if (_point.getAudio() != null && _audioIndex > -1)
+		{
+			// add audio object to list
+			inTrackInfo.getAudioList().addAudio(_point.getAudio(), _audioIndex);
+			_point.getAudio().setDataPoint(_point);
+		}
+		// Restore previous status of following track point if necessary
+		if (!_segmentStart)
+		{
+			// Deletion of point can only set following point to true, so only need to set it back to false
+			DataPoint nextTrackPoint = inTrackInfo.getTrack().getNextTrackPoint(_pointIndex + 1);
+			if (nextTrackPoint != null) {
+				nextTrackPoint.setSegmentStart(false);
+			}
+		}
+		// If there's a current point or range selected, maybe need to adjust start and/or end
+		modifySelection(inTrackInfo, _pointIndex, _pointIndex);
 	}
-}
\ No newline at end of file
+}