X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FTrackInfo.java;h=4695d351e6c124c398e0df90c911dbe0583c4dbe;hp=71363dae1053ed3e89dba907a8dea89adfada90f;hb=d3679d647d57c2ee7376ddbf6def2d5b23c04307;hpb=312fec956e43f5d0a38617da5d0add9c62563e2c

diff --git a/tim/prune/data/TrackInfo.java b/tim/prune/data/TrackInfo.java
index 71363da..4695d35 100644
--- a/tim/prune/data/TrackInfo.java
+++ b/tim/prune/data/TrackInfo.java
@@ -1,5 +1,7 @@
 package tim.prune.data;
 
+import java.util.List;
+
 import tim.prune.UpdateMessageBroker;
 
 /**
@@ -12,6 +14,9 @@ public class TrackInfo
 	private Track _track = null;
 	private Selection _selection = null;
 	private FileInfo _fileInfo = null;
+	// TODO: How to store photos? In separate list to be maintained or dynamic? Only store pointless photos?
+	private PhotoList _photoList = null;
+
 
 	/**
 	 * Constructor
@@ -24,6 +29,7 @@ public class TrackInfo
 		_track = inTrack;
 		_selection = new Selection(_track, inBroker);
 		_fileInfo = new FileInfo();
+		_photoList = new PhotoList();
 	}
 
 
@@ -53,6 +59,14 @@ public class TrackInfo
 		return _fileInfo;
 	}
 
+	/**
+	 * @return the PhotoList object
+	 */
+	public PhotoList getPhotoList()
+	{
+		return _photoList;
+	}
+
 	/**
 	 * Get the currently selected point, if any
 	 * @return DataPoint if single point selected, otherwise null
@@ -77,12 +91,63 @@ public class TrackInfo
 	}
 
 
+	/**
+	 * Add a List of Photos
+	 * @param inList List containing Photo objects
+	 * @return number of photos added
+	 */
+	public int addPhotos(List inList)
+	{
+		// Firstly count number to add to make array
+		int numPhotosToAdd = 0;
+		if (inList != null && !inList.isEmpty())
+		{
+			for (int i=0; i<inList.size(); i++)
+			{
+				try
+				{
+					Photo photo = (Photo) inList.get(i);
+					if (photo != null && !_photoList.contains(photo))
+					{
+						numPhotosToAdd++;
+					}
+				}
+				catch (ClassCastException ce) {}
+			}
+		}
+		// If there are any photos to add, add them
+		if (numPhotosToAdd > 0)
+		{
+			DataPoint[] dataPoints = new DataPoint[numPhotosToAdd];
+			int pointNum = 0;
+			// Add each Photo in turn
+			for (int i=0; i<inList.size(); i++)
+			{
+				try
+				{
+					Photo photo = (Photo) inList.get(i);
+					if (photo != null && !_photoList.contains(photo))
+					{
+						_photoList.addPhoto(photo);
+						dataPoints[pointNum] = photo.getDataPoint();
+						pointNum++;
+					}
+				}
+				catch (ClassCastException ce) {}
+			}
+			_track.appendPoints(dataPoints);
+		}
+		return numPhotosToAdd;
+	}
+
+
 	/**
 	 * Delete the currently selected range of points
 	 * @return true if successful
 	 */
 	public boolean deleteRange()
 	{
+		// TODO: Check whether to delete photos associated with this range
 		int currPoint = _selection.getCurrentPointIndex();
 		int startSel = _selection.getStart();
 		int endSel = _selection.getEnd();
@@ -101,6 +166,7 @@ public class TrackInfo
 	{
 		if (_track.deletePoint(_selection.getCurrentPointIndex()))
 		{
+			// TODO: Check whether to delete photo associated with this point
 			_selection.modifyPointDeleted();
 			_broker.informSubscribers();
 			return true;
@@ -159,4 +225,17 @@ public class TrackInfo
 			_selection.selectRangeEnd(_selection.getEnd() + inNumPoints);
 		return success;
 	}
+
+
+	/**
+	 * Select the given DataPoint
+	 * @param inPoint DataPoint object to select
+	 */
+	public void selectPoint(DataPoint inPoint)
+	{
+		// get the index of the given Point
+		int index = _track.getPointIndex(inPoint);
+		// give to selection
+		_selection.selectPoint(index);
+	}
 }