X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2FJpegLoader.java;h=3e22eba029ccb76ce341a2fffaea6327669a28f1;hb=92dad5df664287acb51728e9ea599f150765d34a;hp=feec754f22f7049dc7bcef4b26d71cba534d2ed2;hpb=140e9d165f85c3d4f0435a311e091209313faa2a;p=GpsPrune.git

diff --git a/tim/prune/load/JpegLoader.java b/tim/prune/load/JpegLoader.java
index feec754..3e22eba 100644
--- a/tim/prune/load/JpegLoader.java
+++ b/tim/prune/load/JpegLoader.java
@@ -1,39 +1,35 @@
 package tim.prune.load;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.TreeSet;
 
-import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JProgressBar;
 
 import tim.prune.App;
 import tim.prune.I18nManager;
 import tim.prune.config.Config;
 import tim.prune.data.Altitude;
 import tim.prune.data.DataPoint;
-import tim.prune.data.Field;
 import tim.prune.data.LatLonRectangle;
 import tim.prune.data.Latitude;
 import tim.prune.data.Longitude;
 import tim.prune.data.Photo;
 import tim.prune.data.Timestamp;
-import tim.prune.jpeg.ExifGateway;
+import tim.prune.data.TimestampLocal;
+import tim.prune.data.TimestampUtc;
+import tim.prune.data.UnitSetLibrary;
+import tim.prune.function.Cancellable;
+import tim.prune.jpeg.InternalExifLibrary;
 import tim.prune.jpeg.JpegData;
 
 /**
  * Class to manage the loading of Jpegs and dealing with the GPS data from them
  */
-public class JpegLoader implements Runnable
+public class JpegLoader implements Runnable, Cancellable
 {
 	private App _app = null;
 	private JFrame _parentFrame = null;
@@ -42,8 +38,7 @@ public class JpegLoader implements Runnable
 	private JCheckBox _subdirCheckbox = null;
 	private JCheckBox _noExifCheckbox = null;
 	private JCheckBox _outsideAreaCheckbox = null;
-	private JDialog _progressDialog   = null;
-	private JProgressBar _progressBar = null;
+	private MediaLoadProgressDialog _progressDialog = null;
 	private int[] _fileCounts = null;
 	private boolean _cancelled = false;
 	private LatLonRectangle _trackRectangle = null;
@@ -59,8 +54,7 @@ public class JpegLoader implements Runnable
 	{
 		_app = inApp;
 		_parentFrame = inParentFrame;
-		String[] fileTypes = {"jpg", "jpe", "jpeg"};
-		_fileFilter = new GenericFileFilter("filetype.jpeg", fileTypes);
+		_fileFilter = new JpegFileFilter();
 	}
 
 
@@ -102,45 +96,16 @@ public class JpegLoader implements Runnable
 		if (_fileChooser.showOpenDialog(_parentFrame) == JFileChooser.APPROVE_OPTION)
 		{
 			// Bring up dialog before starting
-			if (_progressDialog == null) {
-				createProgressDialog();
-			}
-			// reset dialog and show it
-			_progressBar.setValue(0);
-			_progressBar.setString("");
-			_progressDialog.setVisible(true);
+			_progressDialog = new MediaLoadProgressDialog(_parentFrame, this);
+			_progressDialog.show();
 			// start thread for processing
 			new Thread(this).start();
 		}
 	}
 
-
-	/**
-	 * Create the dialog to show the progress
-	 */
-	private void createProgressDialog()
-	{
-		_progressDialog = new JDialog(_parentFrame, I18nManager.getText("dialog.jpegload.progress.title"));
-		_progressDialog.setLocationRelativeTo(_parentFrame);
-		_progressBar = new JProgressBar(0, 100);
-		_progressBar.setValue(0);
-		_progressBar.setStringPainted(true);
-		_progressBar.setString("");
-		JPanel panel = new JPanel();
-		panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-		panel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
-		panel.add(new JLabel(I18nManager.getText("dialog.jpegload.progress")));
-		panel.add(_progressBar);
-		JButton cancelButton = new JButton(I18nManager.getText("button.cancel"));
-		cancelButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e)
-			{
-				_cancelled = true;
-			}
-		});
-		panel.add(cancelButton);
-		_progressDialog.getContentPane().add(panel);
-		_progressDialog.pack();
+	/** Cancel */
+	public void cancel() {
+		_cancelled = true;
 	}
 
 
@@ -150,24 +115,20 @@ public class JpegLoader implements Runnable
 	public void run()
 	{
 		// Initialise arrays, errors, summaries
-		_fileCounts = new int[4]; // files, jpegs, exifs, gps
-		_photos = new TreeSet<Photo>(new PhotoSorter());
+		_fileCounts = new int[3]; // files, jpegs, gps
+		_photos = new TreeSet<Photo>(new MediaSorter());
 		File[] files = _fileChooser.getSelectedFiles();
 		// Loop recursively over selected files/directories to count files
 		int numFiles = countFileList(files, true, _subdirCheckbox.isSelected());
 		// Set up the progress bar for this number of files
-		_progressBar.setMaximum(numFiles);
-		_progressBar.setValue(0);
+		_progressDialog.showProgress(0, numFiles);
 		_cancelled = false;
 
 		// Process the files recursively and build lists of photos
 		processFileList(files, true, _subdirCheckbox.isSelected());
-		_progressDialog.setVisible(false);
-		_progressDialog.dispose(); // Sometimes dialog doesn't disappear without this dispose
+		_progressDialog.close();
 		if (_cancelled) {return;}
 
-		//System.out.println("Finished - counts are: " + _fileCounts[0] + ", " + _fileCounts[1]
-		//  + ", " + _fileCounts[2] + ", " + _fileCounts[3]);
 		if (_fileCounts[0] == 0)
 		{
 			// No files found at all
@@ -179,11 +140,6 @@ public class JpegLoader implements Runnable
 			_app.showErrorMessage("error.jpegload.dialogtitle", "error.jpegload.nojpegsfound");
 		}
 		else if (!_noExifCheckbox.isSelected() && _fileCounts[2] == 0)
-		{
-			// Need coordinates but no exif found
-			_app.showErrorMessage("error.jpegload.dialogtitle", "error.jpegload.noexiffound");
-		}
-		else if (!_noExifCheckbox.isSelected() && _fileCounts[3] == 0)
 		{
 			// Need coordinates but no gps information found
 			_app.showErrorMessage("error.jpegload.dialogtitle", "error.jpegload.nogpsfound");
@@ -204,29 +160,27 @@ public class JpegLoader implements Runnable
 	 */
 	private void processFileList(File[] inFiles, boolean inFirstDir, boolean inDescend)
 	{
-		if (inFiles != null)
+		if (inFiles == null) return;
+		// Loop over elements in array
+		for (int i=0; i<inFiles.length && !_cancelled; i++)
 		{
-			// Loop over elements in array
-			for (int i=0; i<inFiles.length && !_cancelled; i++)
+			File file = inFiles[i];
+			if (file.exists() && file.canRead())
 			{
-				File file = inFiles[i];
-				if (file.exists() && file.canRead())
+				// Check whether it's a file or a directory
+				if (file.isFile())
 				{
-					// Check whether it's a file or a directory
-					if (file.isFile())
-					{
-						processFile(file);
-					}
-					else if (file.isDirectory() && (inFirstDir || inDescend))
-					{
-						// Always process first directory,
-						// only process subdirectories if checkbox selected
-						File[] files = file.listFiles();
-						processFileList(files, false, inDescend);
-					}
+					processFile(file);
+				}
+				else if (file.isDirectory() && (inFirstDir || inDescend))
+				{
+					// Always process first directory,
+					// only process subdirectories if checkbox selected
+					File[] files = file.listFiles();
+					processFileList(files, false, inDescend);
 				}
-				// if file doesn't exist or isn't readable - ignore
 			}
+			// if file doesn't exist or isn't readable - ignore
 		}
 	}
 
@@ -239,26 +193,42 @@ public class JpegLoader implements Runnable
 	{
 		// Update progress bar
 		_fileCounts[0]++; // file found
-		_progressBar.setValue(_fileCounts[0]);
-		_progressBar.setString("" + _fileCounts[0] + " / " + _progressBar.getMaximum());
-		_progressBar.repaint();
+		_progressDialog.showProgress(_fileCounts[0], -1);
 
 		// Check whether filename corresponds with accepted filenames
 		if (!_fileFilter.acceptFilename(inFile.getName())) {return;}
 		// If it's a Jpeg, we can use ExifReader to get coords, otherwise we could try exiftool (if it's installed)
 
-		// Create Photo object
-		Photo photo = new Photo(inFile);
 		if (inFile.exists() && inFile.canRead()) {
 			_fileCounts[1]++; // jpeg found
 		}
+		Photo photo = createPhoto(inFile);
+		if (photo.getDataPoint() != null) {
+			_fileCounts[2]++; // photo has coordinates
+		}
+		// Check the criteria for adding the photo - check whether the photo has coordinates and if so if they're within the rectangle
+		if ( (photo.getDataPoint() != null || _noExifCheckbox.isSelected())
+			&& (photo.getDataPoint() == null || !_outsideAreaCheckbox.isEnabled()
+				|| _outsideAreaCheckbox.isSelected() || _trackRectangle.containsPoint(photo.getDataPoint())))
+		{
+			_photos.add(photo);
+		}
+	}
+
+	/**
+	 * Create a Photo object for the given file, including reading exif information
+	 * @param inFile file object
+	 * @return Photo object
+	 */
+	public static Photo createPhoto(File inFile)
+	{
+		// Create Photo object
+		Photo photo = new Photo(inFile);
 		// Try to get information out of exif
-		JpegData jpegData = ExifGateway.getJpegData(inFile);
+		JpegData jpegData = new InternalExifLibrary().getJpegData(inFile);
 		Timestamp timestamp = null;
 		if (jpegData != null)
 		{
-			if (jpegData.getExifDataPresent())
-				{_fileCounts[2]++;} // exif found
 			if (jpegData.isGpsValid())
 			{
 				timestamp = createTimestamp(jpegData.getGpsDatestamp(), jpegData.getGpsTimestamp());
@@ -268,7 +238,6 @@ public class JpegLoader implements Runnable
 				point.setSegmentStart(true);
 				photo.setDataPoint(point);
 				photo.setOriginalStatus(Photo.Status.TAGGED);
-				_fileCounts[3]++;
 			}
 			// Use exif timestamp if gps timestamp not available
 			if (timestamp == null && jpegData.getOriginalTimestamp() != null) {
@@ -280,23 +249,19 @@ public class JpegLoader implements Runnable
 			photo.setExifThumbnail(jpegData.getThumbnailImage());
 			// Also extract orientation tag for setting rotation state of photo
 			photo.setRotation(jpegData.getRequiredRotation());
+			// Set bearing, if any
+			photo.setBearing(jpegData.getBearing());
 		}
 		// Use file timestamp if exif timestamp isn't available
 		if (timestamp == null) {
-			timestamp = new Timestamp(inFile.lastModified());
+			timestamp = new TimestampUtc(inFile.lastModified());
 		}
 		// Apply timestamp to photo and its point (if any)
 		photo.setTimestamp(timestamp);
 		if (photo.getDataPoint() != null) {
-			photo.getDataPoint().setFieldValue(Field.TIMESTAMP, timestamp.getText(Timestamp.FORMAT_ISO_8601), false);
-		}
-		// Check the criteria for adding the photo - check whether the photo has coordinates and if so if they're within the rectangle
-		if ( (photo.getDataPoint() != null || _noExifCheckbox.isSelected())
-			&& (photo.getDataPoint() == null || !_outsideAreaCheckbox.isEnabled()
-				|| _outsideAreaCheckbox.isSelected() || _trackRectangle.containsPoint(photo.getDataPoint())))
-		{
-			_photos.add(photo);
+			// photo.getDataPoint().setFieldValue(Field.TIMESTAMP, timestamp.getText(Timestamp.Format.ISO8601), false);
 		}
+		return photo;
 	}
 
 
@@ -355,7 +320,7 @@ public class JpegLoader implements Runnable
 		Longitude longitude = new Longitude(lonval, Longitude.FORMAT_DEG_MIN_SEC);
 		Altitude altitude = null;
 		if (inData.hasAltitude()) {
-			altitude = new Altitude(inData.getAltitude(), Altitude.Format.METRES);
+			altitude = new Altitude(inData.getAltitude(), UnitSetLibrary.UNITS_METRES);
 		}
 		return new DataPoint(latitude, longitude, altitude);
 	}
@@ -391,7 +356,7 @@ public class JpegLoader implements Runnable
 		if (inDate == null || inTime == null || inDate.length != 3 || inTime.length != 3) {
 			return null;
 		}
-		return new Timestamp(inDate[0], inDate[1], inDate[2],
+		return new TimestampLocal(inDate[0], inDate[1], inDate[2],
 			inTime[0], inTime[1], inTime[2]);
 	}
 
@@ -406,7 +371,7 @@ public class JpegLoader implements Runnable
 		Timestamp stamp = null;
 		try
 		{
-			stamp = new Timestamp(Integer.parseInt(inStamp.substring(0, 4)),
+			stamp = new TimestampLocal(Integer.parseInt(inStamp.substring(0, 4)),
 				Integer.parseInt(inStamp.substring(5, 7)),
 				Integer.parseInt(inStamp.substring(8, 10)),
 				Integer.parseInt(inStamp.substring(11, 13)),