X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2FApp.java;h=770fd2089aaac23518ecd687bec0f0d8878ee738;hb=f1b92378a792131ac8fb33a869405851d5b2d1f7;hp=88cafea3cd1901e23949ccba07579f3bdeabe8d4;hpb=140e9d165f85c3d4f0435a311e091209313faa2a;p=GpsPrune.git

diff --git a/tim/prune/App.java b/tim/prune/App.java
index 88cafea..770fd20 100644
--- a/tim/prune/App.java
+++ b/tim/prune/App.java
@@ -9,6 +9,7 @@ import java.util.Stack;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
+import tim.prune.config.Config;
 import tim.prune.data.Altitude;
 import tim.prune.data.Checker;
 import tim.prune.data.DataPoint;
@@ -17,20 +18,25 @@ import tim.prune.data.LatLonRectangle;
 import tim.prune.data.NumberUtils;
 import tim.prune.data.Photo;
 import tim.prune.data.PhotoList;
+import tim.prune.data.RecentFile;
 import tim.prune.data.SourceInfo;
 import tim.prune.data.Track;
 import tim.prune.data.TrackInfo;
+import tim.prune.data.SourceInfo.FILE_TYPE;
+import tim.prune.function.AsyncMediaLoader;
+import tim.prune.function.SaveConfig;
 import tim.prune.function.SelectTracksFunction;
 import tim.prune.function.browser.BrowserLauncher;
 import tim.prune.function.browser.UrlGenerator;
 import tim.prune.function.edit.FieldEditList;
 import tim.prune.function.edit.PointEditor;
-import tim.prune.gui.SidebarController;
 import tim.prune.gui.MenuManager;
+import tim.prune.gui.SidebarController;
 import tim.prune.gui.UndoManager;
 import tim.prune.gui.Viewport;
 import tim.prune.load.FileLoader;
 import tim.prune.load.JpegLoader;
+import tim.prune.load.MediaLinkInfo;
 import tim.prune.load.TrackNameList;
 import tim.prune.save.ExifSaver;
 import tim.prune.save.FileSaver;
@@ -48,7 +54,7 @@ public class App
 	private TrackInfo _trackInfo = null;
 	private int _lastSavePosition = 0;
 	private MenuManager _menuManager = null;
-	private SidebarController __sidebarController = null;
+	private SidebarController _sidebarController = null;
 	private FileLoader _fileLoader = null;
 	private JpegLoader _jpegLoader = null;
 	private FileSaver _fileSaver = null;
@@ -57,6 +63,7 @@ public class App
 	private Viewport _viewport = null;
 	private ArrayList<File> _dataFiles = null;
 	private boolean _firstDataFile = true;
+	private boolean _busyLoading = false;
 
 
 	/**
@@ -206,6 +213,10 @@ public class App
 				JOptionPane.WARNING_MESSAGE, null, buttonTexts, buttonTexts[1])
 			== JOptionPane.YES_OPTION)
 		{
+			// save settings
+			if (Config.getConfigBoolean(Config.KEY_AUTOSAVE_SETTINGS)) {
+				new SaveConfig(this).silentSave();
+			}
 			System.exit(0);
 		}
 	}
@@ -267,7 +278,7 @@ public class App
 			{
 				// Confirm deletion of photo or decoupling
 				int response = JOptionPane.showConfirmDialog(_frame,
-					I18nManager.getText("dialog.deletepoint.deletephoto") + " " + currentPhoto.getFile().getName(),
+					I18nManager.getText("dialog.deletepoint.deletephoto") + " " + currentPhoto.getName(),
 					I18nManager.getText("dialog.deletepoint.title"),
 					JOptionPane.YES_NO_CANCEL_OPTION);
 				if (response == JOptionPane.CANCEL_OPTION || response == JOptionPane.CLOSED_OPTION)
@@ -301,6 +312,7 @@ public class App
 						// decouple photo from point
 						currentPhoto.setDataPoint(null);
 					}
+					UpdateMessageBroker.informSubscribers();
 				}
 				// Confirm
 				UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.deletepoint.single"));
@@ -314,83 +326,81 @@ public class App
 	 */
 	public void deleteSelectedRange()
 	{
-		if (_track != null)
+		if (_track == null) return;
+		// Find out if photos should be deleted or not
+		int selStart = _trackInfo.getSelection().getStart();
+		int selEnd = _trackInfo.getSelection().getEnd();
+		if (selStart >= 0 && selEnd >= selStart)
 		{
-			// Find out if photos should be deleted or not
-			int selStart = _trackInfo.getSelection().getStart();
-			int selEnd = _trackInfo.getSelection().getEnd();
-			if (selStart >= 0 && selEnd >= selStart)
+			int numToDelete = selEnd - selStart + 1;
+			boolean[] deletePhotos = new boolean[numToDelete];
+			Photo[] photosToDelete = new Photo[numToDelete];
+			boolean deleteAll = false;
+			boolean deleteNone = false;
+			String[] questionOptions = {I18nManager.getText("button.yes"), I18nManager.getText("button.no"),
+				I18nManager.getText("button.yestoall"), I18nManager.getText("button.notoall"),
+				I18nManager.getText("button.cancel")};
+			DataPoint point = null;
+			for (int i=0; i<numToDelete; i++)
 			{
-				int numToDelete = selEnd - selStart + 1;
-				boolean[] deletePhotos = new boolean[numToDelete];
-				Photo[] photosToDelete = new Photo[numToDelete];
-				boolean deleteAll = false;
-				boolean deleteNone = false;
-				String[] questionOptions = {I18nManager.getText("button.yes"), I18nManager.getText("button.no"),
-					I18nManager.getText("button.yestoall"), I18nManager.getText("button.notoall"),
-					I18nManager.getText("button.cancel")};
-				DataPoint point = null;
-				for (int i=0; i<numToDelete; i++)
+				point = _trackInfo.getTrack().getPoint(i + selStart);
+				if (point != null && point.getPhoto() != null)
 				{
-					point = _trackInfo.getTrack().getPoint(i + selStart);
-					if (point != null && point.getPhoto() != null)
+					if (deleteAll)
+					{
+						deletePhotos[i] = true;
+						photosToDelete[i] = point.getPhoto();
+					}
+					else if (deleteNone) {deletePhotos[i] = false;}
+					else
 					{
-						if (deleteAll)
+						int response = JOptionPane.showOptionDialog(_frame,
+							I18nManager.getText("dialog.deletepoint.deletephoto") + " " + point.getPhoto().getName(),
+							I18nManager.getText("dialog.deletepoint.title"),
+							JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null,
+							questionOptions, questionOptions[1]);
+						// check for cancel or close
+						if (response == 4 || response == -1) {return;}
+						// check for yes or yes to all
+						if (response == 0 || response == 2)
 						{
 							deletePhotos[i] = true;
 							photosToDelete[i] = point.getPhoto();
+							if (response == 2) {deleteAll = true;}
 						}
-						else if (deleteNone) {deletePhotos[i] = false;}
-						else
-						{
-							int response = JOptionPane.showOptionDialog(_frame,
-								I18nManager.getText("dialog.deletepoint.deletephoto") + " " + point.getPhoto().getFile().getName(),
-								I18nManager.getText("dialog.deletepoint.title"),
-								JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null,
-								questionOptions, questionOptions[1]);
-							// check for cancel or close
-							if (response == 4 || response == -1) {return;}
-							// check for yes or yes to all
-							if (response == 0 || response == 2)
-							{
-								deletePhotos[i] = true;
-								photosToDelete[i] = point.getPhoto();
-								if (response == 2) {deleteAll = true;}
-							}
-							// check for no to all
-							if (response == 3) {deleteNone = true;}
-						}
+						// check for no to all
+						if (response == 3) {deleteNone = true;}
 					}
 				}
-				// add information to undo stack
-				UndoDeleteRange undo = new UndoDeleteRange(_trackInfo);
-				// delete requested photos
-				for (int i=0; i<numToDelete; i++)
+			}
+			// add information to undo stack
+			UndoDeleteRange undo = new UndoDeleteRange(_trackInfo);
+			// delete requested photos
+			for (int i=0; i<numToDelete; i++)
+			{
+				point = _trackInfo.getTrack().getPoint(i + selStart);
+				if (point != null && point.getPhoto() != null)
 				{
-					point = _trackInfo.getTrack().getPoint(i + selStart);
-					if (point != null && point.getPhoto() != null)
+					if (deletePhotos[i])
 					{
-						if (deletePhotos[i])
-						{
-							// delete photo from list
-							_trackInfo.getPhotoList().deletePhoto(_trackInfo.getPhotoList().getPhotoIndex(point.getPhoto()));
-						}
-						else
-						{
-							// decouple from point
-							point.getPhoto().setDataPoint(null);
-						}
+						// delete photo from list
+						_trackInfo.getPhotoList().deletePhoto(_trackInfo.getPhotoList().getPhotoIndex(point.getPhoto()));
+					}
+					else
+					{
+						// decouple from point
+						point.getPhoto().setDataPoint(null);
 					}
-				}
-				// call track to delete range
-				if (_trackInfo.deleteRange())
-				{
-					_undoStack.push(undo);
-					// Confirm
-					UpdateMessageBroker.informSubscribers("" + numToDelete + " "
-						+ I18nManager.getText("confirm.deletepoint.multi"));
 				}
 			}
+			// call track to delete range
+			if (_trackInfo.deleteRange())
+			{
+				_undoStack.push(undo);
+				// Confirm
+				UpdateMessageBroker.informSubscribers("" + numToDelete + " "
+					+ I18nManager.getText("confirm.deletepoint.multi"));
+			}
 		}
 	}
 
@@ -638,7 +648,7 @@ public class App
 	public void informDataLoaded(Field[] inFieldArray, Object[][] inDataArray,
 		Altitude.Format inAltFormat, SourceInfo inSourceInfo)
 	{
-		informDataLoaded(inFieldArray, inDataArray, inAltFormat, inSourceInfo, null);
+		informDataLoaded(inFieldArray, inDataArray, inAltFormat, inSourceInfo, null, null);
 	}
 
 	/**
@@ -651,6 +661,24 @@ public class App
 	 */
 	public void informDataLoaded(Field[] inFieldArray, Object[][] inDataArray,
 		Altitude.Format inAltFormat, SourceInfo inSourceInfo, TrackNameList inTrackNameList)
+	{
+		// no link array given
+		informDataLoaded(inFieldArray, inDataArray, inAltFormat, inSourceInfo,
+			inTrackNameList, null);
+	}
+
+	/**
+	 * Receive loaded data and determine whether to filter on tracks or not
+	 * @param inFieldArray array of fields
+	 * @param inDataArray array of data
+	 * @param inAltFormat altitude format
+	 * @param inSourceInfo information about the source of the data
+	 * @param inTrackNameList information about the track names
+	 * @param inLinkInfo links to photo/audio clips
+	 */
+	public void informDataLoaded(Field[] inFieldArray, Object[][] inDataArray,
+		Altitude.Format inAltFormat, SourceInfo inSourceInfo,
+		TrackNameList inTrackNameList, MediaLinkInfo inLinkInfo)
 	{
 		// Check whether loaded array can be properly parsed into a Track
 		Track loadedTrack = new Track();
@@ -667,12 +695,21 @@ public class App
 			JOptionPane.showMessageDialog(_frame, I18nManager.getText("dialog.open.contentsdoubled"),
 				I18nManager.getText("function.open"), JOptionPane.WARNING_MESSAGE);
 		}
+
+		_busyLoading = true;
+		// Attach photos and/or audio clips to points
+		if (inLinkInfo != null)
+		{
+			String[] linkArray = inLinkInfo.getLinkArray();
+			if (linkArray != null) {
+				new AsyncMediaLoader(this, inLinkInfo.getZipFile(), linkArray, loadedTrack, inSourceInfo.getFile()).begin();
+			}
+		}
 		// Look at TrackNameList, decide whether to filter or not
 		if (inTrackNameList != null && inTrackNameList.getNumTracks() > 1)
 		{
 			// Launch a dialog to let the user choose which tracks to load, then continue
-			new SelectTracksFunction(this, inFieldArray, inDataArray, inAltFormat, inSourceInfo,
-				inTrackNameList).begin();
+			new SelectTracksFunction(this, loadedTrack, inSourceInfo, inTrackNameList).begin();
 		}
 		else {
 			// go directly to load
@@ -680,6 +717,7 @@ public class App
 		}
 	}
 
+
 	/**
 	 * Receive loaded data and optionally merge with current Track
 	 * @param inLoadedTrack loaded track
@@ -705,7 +743,9 @@ public class App
 			if (answer == JOptionPane.YES_OPTION)
 			{
 				// append data to current Track
-				_undoStack.add(new UndoLoad(_track.getNumPoints(), inLoadedTrack.getNumPoints()));
+				UndoLoad undo = new UndoLoad(_track.getNumPoints(), inLoadedTrack.getNumPoints());
+				undo.setNumPhotosAudios(_trackInfo.getPhotoList().getNumPhotos(), _trackInfo.getAudioList().getNumAudios());
+				_undoStack.add(undo);
 				_track.combine(inLoadedTrack);
 				// set source information
 				inSourceInfo.populatePointObjects(_track, inLoadedTrack.getNumPoints());
@@ -718,33 +758,41 @@ public class App
 				if (_trackInfo.getPhotoList().hasCorrelatedPhotos()) {
 					photos = _trackInfo.getPhotoList().cloneList();
 				}
-				_undoStack.add(new UndoLoad(_trackInfo, inLoadedTrack.getNumPoints(), photos));
+				UndoLoad undo = new UndoLoad(_trackInfo, inLoadedTrack.getNumPoints(), photos);
+				undo.setNumPhotosAudios(_trackInfo.getPhotoList().getNumPhotos(), _trackInfo.getAudioList().getNumAudios());
+				_undoStack.add(undo);
 				_lastSavePosition = _undoStack.size();
 				_trackInfo.getSelection().clearAll();
 				_track.load(inLoadedTrack);
 				inSourceInfo.populatePointObjects(_track, _track.getNumPoints());
 				_trackInfo.getFileInfo().replaceSource(inSourceInfo);
-				if (photos != null) {
-					_trackInfo.getPhotoList().removeCorrelatedPhotos();
-				}
+				_trackInfo.getPhotoList().removeCorrelatedPhotos();
+				_trackInfo.getAudioList().removeCorrelatedAudios();
 			}
 		}
 		else
 		{
 			// Currently no data held, so transfer received data
-			_undoStack.add(new UndoLoad(_trackInfo, inLoadedTrack.getNumPoints(), null));
+			UndoLoad undo = new UndoLoad(_trackInfo, inLoadedTrack.getNumPoints(), null);
+			undo.setNumPhotosAudios(_trackInfo.getPhotoList().getNumPhotos(), _trackInfo.getAudioList().getNumAudios());
+			_undoStack.add(undo);
 			_lastSavePosition = _undoStack.size();
 			_trackInfo.getSelection().clearAll();
 			_track.load(inLoadedTrack);
 			inSourceInfo.populatePointObjects(_track, _track.getNumPoints());
 			_trackInfo.getFileInfo().addSource(inSourceInfo);
 		}
+		// Update config before subscribers are told
+		boolean isRegularLoad = (inSourceInfo.getFileType() != FILE_TYPE.GPSBABEL);
+		Config.getRecentFileList().addFile(new RecentFile(inSourceInfo.getFile(), isRegularLoad));
 		UpdateMessageBroker.informSubscribers();
 		// Update status bar
 		UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.loadfile")
 			+ " '" + inSourceInfo.getName() + "'");
 		// update menu
 		_menuManager.informFileLoaded();
+		// Remove busy lock
+		_busyLoading = false;
 		// load next file if there's a queue
 		loadNextFile();
 	}
@@ -805,92 +853,7 @@ public class App
 			// MAYBE: Improve message when photo(s) fail to load (eg already added)
 			UpdateMessageBroker.informSubscribers();
 			// update menu
-			_menuManager.informFileLoaded();
-		}
-	}
-
-
-	/**
-	 * Connect the current photo to the current point
-	 */
-	public void connectPhotoToPoint()
-	{
-		Photo photo = _trackInfo.getCurrentPhoto();
-		DataPoint point = _trackInfo.getCurrentPoint();
-		if (photo != null && point != null)
-		{
-			if (point.getPhoto() == null)
-			{
-				// point doesn't currently have a photo, so just connect it
-				_undoStack.add(new UndoConnectPhoto(point, photo.getFile().getName()));
-				photo.setDataPoint(point);
-				point.setPhoto(photo);
-				UpdateMessageBroker.informSubscribers(DataSubscriber.SELECTION_CHANGED);
-				UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.photo.connect"));
-			}
-		}
-	}
-
-
-	/**
-	 * Disconnect the current photo from its point
-	 */
-	public void disconnectPhotoFromPoint()
-	{
-		Photo photo = _trackInfo.getCurrentPhoto();
-		if (photo != null && photo.getDataPoint() != null)
-		{
-			DataPoint point = photo.getDataPoint();
-			_undoStack.add(new UndoDisconnectPhoto(point, photo.getFile().getName()));
-			// disconnect
-			photo.setDataPoint(null);
-			point.setPhoto(null);
-			UpdateMessageBroker.informSubscribers(DataSubscriber.SELECTION_CHANGED);
-			UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.photo.disconnect"));
-		}
-	}
-
-
-	/**
-	 * Remove the current photo, if any
-	 */
-	public void deleteCurrentPhoto()
-	{
-		// Delete the current photo, and optionally its point too, keeping undo information
-		Photo currentPhoto = _trackInfo.getCurrentPhoto();
-		if (currentPhoto != null)
-		{
-			// Photo is selected, see if it has a point or not
-			boolean photoDeleted = false;
-			UndoDeletePhoto undoAction = null;
-			if (currentPhoto.getDataPoint() == null)
-			{
-				// no point attached, so just delete photo
-				undoAction = new UndoDeletePhoto(currentPhoto, _trackInfo.getSelection().getCurrentPhotoIndex(),
-					null, -1);
-				photoDeleted = _trackInfo.deleteCurrentPhoto(false);
-			}
-			else
-			{
-				// point is attached, so need to confirm point deletion
-				undoAction = new UndoDeletePhoto(currentPhoto, _trackInfo.getSelection().getCurrentPhotoIndex(),
-					currentPhoto.getDataPoint(), _trackInfo.getTrack().getPointIndex(currentPhoto.getDataPoint()));
-				int response = JOptionPane.showConfirmDialog(_frame,
-					I18nManager.getText("dialog.deletephoto.deletepoint"),
-					I18nManager.getText("dialog.deletephoto.title"),
-					JOptionPane.YES_NO_CANCEL_OPTION);
-				boolean deletePointToo = (response == JOptionPane.YES_OPTION);
-				// Cancel delete if cancel pressed or dialog closed
-				if (response == JOptionPane.YES_OPTION || response == JOptionPane.NO_OPTION)
-				{
-					photoDeleted = _trackInfo.deleteCurrentPhoto(deletePointToo);
-				}
-			}
-			// Add undo information to stack if necessary
-			if (photoDeleted)
-			{
-				_undoStack.add(undoAction);
-			}
+			if (numPointsAdded > 0) _menuManager.informFileLoaded();
 		}
 	}
 
@@ -1057,7 +1020,7 @@ public class App
 	 */
 	public void setSidebarController(SidebarController inController)
 	{
-		__sidebarController = inController;
+		_sidebarController = inController;
 	}
 
 	/**
@@ -1065,6 +1028,11 @@ public class App
 	 */
 	public void toggleSidebars()
 	{
-		__sidebarController.toggle();
+		_sidebarController.toggle();
+	}
+
+	/** @return true if App is currently busy with loading data */
+	public boolean isBusyLoading() {
+		return _busyLoading;
 	}
 }