Version 14, October 2012

[GpsPrune.git] / tim / prune / undo / UndoDeletePoint.java

diff --git a/tim/prune/undo/UndoDeletePoint.java b/tim/prune/undo/UndoDeletePoint.java
index daab9fd574c89d177737f9adaf2a34636d09e6bf..9919d0d3a7dd9cac197bc2059a15a38c996bb88e 100644 (file)
--- a/tim/prune/undo/UndoDeletePoint.java
+++ b/tim/prune/undo/UndoDeletePoint.java
@@ -12,6 +12,8 @@ public class UndoDeletePoint implements UndoOperation
        private int _pointIndex = -1;\r
        private DataPoint _point = null;\r
        private int _photoIndex = -1;\r
+       private int _audioIndex = -1;\r
+       private boolean _segmentStart = false;\r
 \r
 \r
        /**\r
@@ -19,12 +21,17 @@ public class UndoDeletePoint implements UndoOperation
         * @param inPointIndex index number of point within track\r
         * @param inPoint data point\r
         * @param inPhotoIndex index number of photo within photo list\r
+        * @param inAudioIndex index number of audio within audio list\r
+        * @param inSegmentStart true if following track point starts new segment\r
         */\r
-       public UndoDeletePoint(int inPointIndex, DataPoint inPoint, int inPhotoIndex)\r
+       public UndoDeletePoint(int inPointIndex, DataPoint inPoint, int inPhotoIndex, int inAudioIndex,\r
+               boolean inSegmentStart)\r
        {\r
                _pointIndex = inPointIndex;\r
                _point = inPoint;\r
                _photoIndex = inPhotoIndex;\r
+               _audioIndex = inAudioIndex;\r
+               _segmentStart = inSegmentStart;\r
        }\r
 \r
 \r
@@ -62,7 +69,25 @@ public class UndoDeletePoint implements UndoOperation
                                inTrackInfo.getPhotoList().addPhoto(_point.getPhoto(), _photoIndex);\r
                        }\r
                        // Ensure that photo is associated with point\r
-                       _point.getPhoto().setDataPoint(_point);\r
+                       if (_point.getPhoto().getDataPoint() != _point) {\r
+                               _point.getPhoto().setDataPoint(_point);\r
+                       }\r
+               }\r
+               // Re-add audio as well if necessary\r
+               if (_point.getAudio() != null && _audioIndex > -1)\r
+               {\r
+                       // add audio object to list\r
+                       inTrackInfo.getAudioList().addAudio(_point.getAudio(), _audioIndex);\r
+                       _point.getAudio().setDataPoint(_point);\r
+               }\r
+               // Restore previous status of following track point if necessary\r
+               if (!_segmentStart)\r
+               {\r
+                       // Deletion of point can only set following point to true, so only need to set it back to false\r
+                       DataPoint nextTrackPoint = inTrackInfo.getTrack().getNextTrackPoint(_pointIndex + 1);\r
+                       if (nextTrackPoint != null) {\r
+                               nextTrackPoint.setSegmentStart(false);\r
+                       }\r
                }\r
        }\r
 }\r