X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FPhoto.java;h=c9046743a704ca2629e8341ebef1d4497f878384;hb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa;hp=805e22ea6254b8f88f78ca9b766d6d6c699590eb;hpb=54b9d8bc8f0025ccf97a67d9dd217ef1f9cf082f;p=GpsPrune.git

diff --git a/tim/prune/data/Photo.java b/tim/prune/data/Photo.java
index 805e22e..c904674 100644
--- a/tim/prune/data/Photo.java
+++ b/tim/prune/data/Photo.java
@@ -8,94 +8,23 @@ import javax.swing.ImageIcon;
 /**
  * Class to represent a photo and link to DataPoint
  */
-public class Photo
+public class Photo extends MediaFile
 {
-	/** File where photo is stored */
-	private File _file = null;
-	/** Timestamp, if any */
-	private Timestamp _timestamp = null;
-	/** Associated DataPoint if correlated */
-	private DataPoint _dataPoint = null;
 	/** Size of original image */
 	private Dimension _size = null;
-	/** Status of photo when loaded */
-	private Status _originalStatus = Status.NOT_CONNECTED;
-	/** Current photo status */
-	private Status _currentStatus = Status.NOT_CONNECTED;
+	/** rotation flag (clockwise from 0 to 3) */
+	private int _rotation = 0;
 	// TODO: Need to store caption for image?
 	// thumbnail for image (from exif)
 	private byte[] _exifThumbnail = null;
 
-	/** Photo status */
-	public enum Status {
-		/** Photo is not connected to any point */
-		NOT_CONNECTED,
-		/** Photo has been connected to a point since it was loaded */
-		TAGGED,
-		/** Photo is connected to a point */
-		CONNECTED
-	};
-
-
 	/**
 	 * Constructor
 	 * @param inFile File object for photo
 	 */
 	public Photo(File inFile)
 	{
-		_file = inFile;
-	}
-
-
-	/**
-	 * @return File object where photo resides
-	 */
-	public File getFile()
-	{
-		return _file;
-	}
-
-
-	/**
-	 * Set the data point associated with the photo
-	 * @param inPoint DataPoint with coordinates etc
-	 */
-	public void setDataPoint(DataPoint inPoint)
-	{
-		_dataPoint = inPoint;
-		// set status according to point
-		if (inPoint == null)
-		{
-			setCurrentStatus(Status.NOT_CONNECTED);
-		}
-		else
-		{
-			setCurrentStatus(Status.CONNECTED);
-		}
-	}
-
-	/**
-	 * @return the DataPoint object
-	 */
-	public DataPoint getDataPoint()
-	{
-		return _dataPoint;
-	}
-
-	/**
-	 * @param inTimestamp Timestamp of photo
-	 */
-	public void setTimestamp(Timestamp inTimestamp)
-	{
-		_timestamp = inTimestamp;
-	}
-
-	/**
-	 * @return timestamp of photo
-	 */
-	public Timestamp getTimestamp()
-	{
-		return _timestamp;
+		super(inFile, null);
 	}
 
 	/**
@@ -117,8 +46,7 @@ public class Photo
 	 */
 	public Dimension getSize()
 	{
-		if (_size == null)
-		{
+		if (_size == null) {
 			calculateSize();
 		}
 		return _size;
@@ -150,38 +78,6 @@ public class Photo
 		return _size.height;
 	}
 
-	/**
-	 * @param inStatus status of photo when loaded
-	 */
-	public void setOriginalStatus(Status inStatus)
-	{
-		_originalStatus = inStatus;
-		_currentStatus = inStatus;
-	}
-
-	/**
-	 * @return status of photo when it was loaded
-	 */
-	public Status getOriginalStatus()
-	{
-		return _originalStatus;
-	}
-
-	/**
-	 * @return current status of photo
-	 */
-	public Status getCurrentStatus()
-	{
-		return _currentStatus;
-	}
-	/**
-	 * @param inStatus current status of photo
-	 */
-	public void setCurrentStatus(Status inStatus)
-	{
-		_currentStatus = inStatus;
-	}
-
 	/**
 	 * @return byte array of thumbnail data
 	 */
@@ -208,13 +104,30 @@ public class Photo
 	}
 
 	/**
-	 * Check if a Photo object refers to the same File as another
-	 * @param inOther other Photo object
-	 * @return true if the Files are the same
+	 * @param inRotation initial rotation value (from exif)
+	 */
+	public void setRotation(int inRotation)
+	{
+		if (inRotation >= 0 && inRotation <= 3) {
+			_rotation = inRotation;
+		}
+	}
+
+	/**
+	 * Rotate the image by 90 degrees
+	 * @param inRight true to rotate right, false for left
+	 */
+	public void rotate(boolean inRight)
+	{
+		int dir = inRight?1:3;
+		_rotation = (_rotation + dir) % 4;
+	}
+
+	/**
+	 * @return rotation status
 	 */
-	public boolean equals(Photo inOther)
+	public int getRotationDegrees()
 	{
-		return (inOther != null && inOther.getFile() != null && getFile() != null
-			&& inOther.getFile().equals(getFile()));
+		return _rotation * 90;
 	}
 }