X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fundo%2FUndoDeletePoint.java;h=adb2ea397d0baffcb3d5f410c850c8d3cc3b3cd1;hb=649c5da6ee1bbc590699e11a92316ece2ea8512d;hp=daab9fd574c89d177737f9adaf2a34636d09e6bf;hpb=5625a1abadb5f2ca5f017fe7dbda1d5141cb637b;p=GpsPrune.git

diff --git a/tim/prune/undo/UndoDeletePoint.java b/tim/prune/undo/UndoDeletePoint.java
index daab9fd..adb2ea3 100644
--- a/tim/prune/undo/UndoDeletePoint.java
+++ b/tim/prune/undo/UndoDeletePoint.java
@@ -12,6 +12,7 @@ public class UndoDeletePoint implements UndoOperation
 	private int _pointIndex = -1;
 	private DataPoint _point = null;
 	private int _photoIndex = -1;
+	private boolean _segmentStart = false;
 
 
 	/**
@@ -19,12 +20,14 @@ public class UndoDeletePoint implements UndoOperation
 	 * @param inPointIndex index number of point within track
 	 * @param inPoint data point
 	 * @param inPhotoIndex index number of photo within photo list
+	 * @param inSegmentStart true if following track point starts new segment
 	 */
-	public UndoDeletePoint(int inPointIndex, DataPoint inPoint, int inPhotoIndex)
+	public UndoDeletePoint(int inPointIndex, DataPoint inPoint, int inPhotoIndex, boolean inSegmentStart)
 	{
 		_pointIndex = inPointIndex;
 		_point = inPoint;
 		_photoIndex = inPhotoIndex;
+		_segmentStart = inSegmentStart;
 	}
 
 
@@ -62,7 +65,18 @@ public class UndoDeletePoint implements UndoOperation
 				inTrackInfo.getPhotoList().addPhoto(_point.getPhoto(), _photoIndex);
 			}
 			// Ensure that photo is associated with point
-			_point.getPhoto().setDataPoint(_point);
+			if (_point.getPhoto().getDataPoint() != _point) {
+				_point.getPhoto().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);
+			}
 		}
 	}
 }