/**
* 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();
}
{
boolean firstTrackPoint = true;
// Loop between start and end
- for (int i=inStart; i<=inEnd; i++) {
+ for (int i=inStart; i<=inEnd; i++)
+ {
DataPoint point = _track.getPoint(i);
// Set all segments to false apart from first track point
if (point != null && !point.isWaypoint()) {
}
// Find following track point, if any
DataPoint nextPoint = _track.getNextTrackPoint(inEnd+1);
- if (nextPoint != null) {nextPoint.setSegmentStart(true);}
+ if (nextPoint != null) {
+ nextPoint.setSegmentStart(true);
+ }
_selection.markInvalid();
UpdateMessageBroker.informSubscribers();
return true;
public void incrementPointIndex(int inPointIncrement)
{
int index = _selection.getCurrentPointIndex() + inPointIncrement;
- if (index < 0) index = 0;
- else if (index >= _track.getNumPoints()) index = _track.getNumPoints()-1;
+ if (index < 0)
+ index = 0;
+ else if (index >= _track.getNumPoints())
+ index = _track.getNumPoints()-1;
selectPoint(index);
}
*/
public void selectPoint(int inPointIndex)
{
- if (_selection.getCurrentPointIndex() == inPointIndex || inPointIndex >= _track.getNumPoints()) {return;}
+ if (_selection.getCurrentPointIndex() == inPointIndex || inPointIndex >= _track.getNumPoints()) {
+ return;
+ }
DataPoint selectedPoint = _track.getPoint(inPointIndex);
// get the index of the current photo
int photoIndex = _selection.getCurrentPhotoIndex();
*/
public void selectPhoto(int inPhotoIndex)
{
- if (_selection.getCurrentPhotoIndex() == inPhotoIndex) {return;}
+ if (_selection.getCurrentPhotoIndex() == inPhotoIndex) {
+ return;
+ }
// Photo is primary selection here, not as a result of a point selection
// Therefore the photo selection takes priority, deselecting point if necessary
// Find Photo object
// Has the new point got an audio clip?
DataPoint selectedPoint = _track.getPoint(pointIndex);
int audioIndex = _selection.getCurrentAudioIndex();
- if (selectedPoint != null && selectedPoint.getAudio() != null) {
+ if (selectedPoint != null && selectedPoint.getAudio() != null)
+ {
// New point has an audio, so select it
audioIndex = _audioList.getAudioIndex(selectedPoint.getAudio());
}
- else if (currPoint != null && selectedPoint != currPoint && currPoint.getAudio() != null) {
+ else if (currPoint != null && selectedPoint != currPoint && currPoint.getAudio() != null)
+ {
// Old point had an audio, so deselect it
audioIndex = -1;
}
*/
public void selectAudio(int inAudioIndex)
{
- if (_selection.getCurrentAudioIndex() == inAudioIndex) {return;}
+ if (_selection.getCurrentAudioIndex() == inAudioIndex) {
+ return;
+ }
// Audio selection takes priority, deselecting point if necessary
AudioClip audio = _audioList.getAudio(inAudioIndex);
int pointIndex = _selection.getCurrentPointIndex();