Version 16, February 2014

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

diff --git a/tim/prune/undo/UndoDeletePoint.java b/tim/prune/undo/UndoDeletePoint.java
index adb2ea397d0baffcb3d5f410c850c8d3cc3b3cd1..beddfbf32588eec6a16a0657c6935f5878740ce4 100644 (file)
--- a/tim/prune/undo/UndoDeletePoint.java
+++ b/tim/prune/undo/UndoDeletePoint.java
@@ -7,11 +7,12 @@ import tim.prune.data.TrackInfo;
 /**\r
  * Operation to undo a delete of a single point\r
  */\r
-public class UndoDeletePoint implements UndoOperation\r
+public class UndoDeletePoint extends UndoDeleteOperation\r
 {\r
        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
@@ -20,13 +21,16 @@ 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, boolean inSegmentStart)\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
@@ -69,6 +73,13 @@ public class UndoDeletePoint implements UndoOperation
                                _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
@@ -78,5 +89,7 @@ public class UndoDeletePoint implements UndoOperation
                                nextTrackPoint.setSegmentStart(false);\r
                        }\r
                }\r
+               // If there's a current point or range selected, maybe need to adjust start and/or end\r
+               modifySelection(inTrackInfo, _pointIndex, _pointIndex);\r
        }\r
 }\r