X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2FApp.java;h=205d88ae11c74165c23bd6aa7ef1fab275af4485;hp=a1e6a8b8756d2801bdd320fbf14c86a15a3f7b00;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hpb=312fec956e43f5d0a38617da5d0add9c62563e2c diff --git a/tim/prune/App.java b/tim/prune/App.java index a1e6a8b..205d88a 100644 --- a/tim/prune/App.java +++ b/tim/prune/App.java @@ -1,30 +1,46 @@ package tim.prune; +import java.io.File; +import java.util.ArrayList; import java.util.EmptyStackException; +import java.util.Set; 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; import tim.prune.data.Field; +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.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; -import tim.prune.save.KmlExporter; -import tim.prune.undo.UndoCompress; -import tim.prune.undo.UndoDeleteDuplicates; -import tim.prune.undo.UndoDeletePoint; -import tim.prune.undo.UndoDeleteRange; -import tim.prune.undo.UndoException; -import tim.prune.undo.UndoInsert; -import tim.prune.undo.UndoLoad; -import tim.prune.undo.UndoOperation; -import tim.prune.undo.UndoRearrangeWaypoints; -import tim.prune.undo.UndoReverseSection; +import tim.prune.undo.*; /** @@ -38,31 +54,33 @@ public class App private TrackInfo _trackInfo = null; private int _lastSavePosition = 0; private MenuManager _menuManager = null; + private SidebarController _sidebarController = null; private FileLoader _fileLoader = null; - private Stack _undoStack = null; - private UpdateMessageBroker _broker = null; - private boolean _reversePointsConfirmed = false; + private JpegLoader _jpegLoader = null; + private FileSaver _fileSaver = null; + private Stack _undoStack = null; + private boolean _mangleTimestampsConfirmed = false; + private Viewport _viewport = null; + private ArrayList _dataFiles = null; + private boolean _autoAppendNextFile = false; + private boolean _busyLoading = false; + private AppMode _appMode = AppMode.NORMAL; - // Constants - public static final int REARRANGE_TO_START = 0; - public static final int REARRANGE_TO_END = 1; - public static final int REARRANGE_TO_NEAREST = 2; + /** Enum for the app mode - currently only two options but may expand later */ + public enum AppMode {NORMAL, DRAWRECT}; - // TODO: Make waypoint window to allow list of waypoints, edit names etc - /** * Constructor * @param inFrame frame object for application - * @param inBroker message broker */ - public App(JFrame inFrame, UpdateMessageBroker inBroker) + public App(JFrame inFrame) { _frame = inFrame; - _undoStack = new Stack(); - _broker = inBroker; - _track = new Track(_broker); - _trackInfo = new TrackInfo(_track, _broker); + _undoStack = new Stack(); + _track = new Track(); + _trackInfo = new TrackInfo(_track); + FunctionLibrary.initialise(this); } @@ -74,23 +92,66 @@ public class App return _trackInfo; } + /** + * @return the dialog frame + */ + public JFrame getFrame() + { + return _frame; + } + /** * Check if the application has unsaved data * @return true if data is unsaved, false otherwise */ public boolean hasDataUnsaved() { - return _undoStack.size() > _lastSavePosition; + return (_undoStack.size() > _lastSavePosition + && (_track.getNumPoints() > 0 || _trackInfo.getPhotoList().getNumPhotos() > 0)); } /** * @return the undo stack */ - public Stack getUndoStack() + public Stack getUndoStack() { return _undoStack; } + /** + * Load the specified data files one by one + * @param inDataFiles arraylist containing File objects to load + */ + public void loadDataFiles(ArrayList inDataFiles) + { + if (inDataFiles == null || inDataFiles.size() == 0) { + _dataFiles = null; + } + else + { + _dataFiles = inDataFiles; + File f = _dataFiles.get(0); + _dataFiles.remove(0); + // Start load of specified file + if (_fileLoader == null) + _fileLoader = new FileLoader(this, _frame); + _autoAppendNextFile = false; // prompt for append + _fileLoader.openFile(f); + } + } + + /** + * Complete a function execution + * @param inUndo undo object to be added to stack + * @param inConfirmText confirmation text + */ + public void completeFunction(UndoOperation inUndo, String inConfirmText) + { + _undoStack.add(inUndo); + UpdateMessageBroker.informSubscribers(inConfirmText); + setCurrentMode(AppMode.NORMAL); + } + /** * Set the MenuManager object to be informed about changes * @param inManager MenuManager object @@ -113,37 +174,31 @@ public class App /** - * Save the file in the selected format + * Add a photo or a directory of photos */ - public void saveFile() + public void addPhotos() { - if (_track == null) - { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.save.nodata"), - I18nManager.getText("error.save.dialogtitle"), JOptionPane.ERROR_MESSAGE); - } - else - { - FileSaver saver = new FileSaver(this, _frame, _track); - saver.showDialog(_fileLoader.getLastUsedDelimiter()); - } + if (_jpegLoader == null) + _jpegLoader = new JpegLoader(this, _frame); + _jpegLoader.openDialog(new LatLonRectangle(_track.getLatRange(), _track.getLonRange())); } - /** - * Export track data as Kml + * Save the file in the selected format */ - public void exportKml() + public void saveFile() { - if (_track == null) - { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.save.nodata"), - I18nManager.getText("error.save.dialogtitle"), JOptionPane.ERROR_MESSAGE); + if (_track == null) { + showErrorMessage("error.save.dialogtitle", "error.save.nodata"); } else { - KmlExporter exporter = new KmlExporter(this, _frame, _track); - exporter.showDialog(); + if (_fileSaver == null) { + _fileSaver = new FileSaver(this, _frame); + } + char delim = ','; + if (_fileLoader != null) {delim = _fileLoader.getLastUsedDelimiter();} + _fileSaver.showDialog(delim); } } @@ -153,6 +208,9 @@ public class App */ public void exit() { + // grab focus + _frame.toFront(); + _frame.requestFocus(); // check if ok to exit Object[] buttonTexts = {I18nManager.getText("button.exit"), I18nManager.getText("button.cancel")}; if (!hasDataUnsaved() @@ -161,124 +219,144 @@ 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); } } /** - * Delete the currently selected point + * Edit the currently selected point */ - public void deleteCurrentPoint() + public void editCurrentPoint() { if (_track != null) { DataPoint currentPoint = _trackInfo.getCurrentPoint(); if (currentPoint != null) { - // add information to undo stack - int pointIndex = _trackInfo.getSelection().getCurrentPointIndex(); - UndoOperation undo = new UndoDeletePoint(pointIndex, currentPoint); - // call track to delete point - if (_trackInfo.deletePoint()) - { - _undoStack.push(undo); - } + // Open point dialog to display details + PointEditor editor = new PointEditor(this, _frame); + editor.showDialog(_track, currentPoint); } } } /** - * Delete the currently selected range + * Complete the point edit + * @param inEditList field values to edit + * @param inUndoList field values before edit */ - public void deleteSelectedRange() + public void completePointEdit(FieldEditList inEditList, FieldEditList inUndoList) { - if (_track != null) + DataPoint currentPoint = _trackInfo.getCurrentPoint(); + if (inEditList != null && inEditList.getNumEdits() > 0 && currentPoint != null) { // add information to undo stack - UndoOperation undo = new UndoDeleteRange(_trackInfo); - // call track to delete point - if (_trackInfo.deleteRange()) + UndoOperation undo = new UndoEditPoint(currentPoint, inUndoList); + // pass to track for completion + if (_track.editPoint(currentPoint, inEditList, false)) { _undoStack.push(undo); + // Confirm point edit + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.point.edit")); } } } /** - * Delete all the duplicate points in the track + * Delete the currently selected point */ - public void deleteDuplicates() + public void deleteCurrentPoint() { - if (_track != null) + if (_track == null) {return;} + DataPoint currentPoint = _trackInfo.getCurrentPoint(); + if (currentPoint != null) { - // Save undo information - UndoOperation undo = new UndoDeleteDuplicates(_track); - // tell track to do it - int numDeleted = _trackInfo.deleteDuplicates(); - if (numDeleted > 0) + // Check for photo + boolean deletePhoto = false; + Photo currentPhoto = currentPoint.getPhoto(); + if (currentPhoto != null) { - _undoStack.add(undo); - String message = null; - if (numDeleted == 1) + // Confirm deletion of photo or decoupling + int response = JOptionPane.showConfirmDialog(_frame, + 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) { - message = "1 " + I18nManager.getText("dialog.deleteduplicates.single.text"); + // cancel pressed- abort delete + return; } - else - { - message = "" + numDeleted + " " + I18nManager.getText("dialog.deleteduplicates.multi.text"); - } - JOptionPane.showMessageDialog(_frame, message, - I18nManager.getText("dialog.deleteduplicates.title"), JOptionPane.INFORMATION_MESSAGE); + if (response == JOptionPane.YES_OPTION) {deletePhoto = true;} } - else + // store necessary information to undo it later + int pointIndex = _trackInfo.getSelection().getCurrentPointIndex(); + int photoIndex = _trackInfo.getPhotoList().getPhotoIndex(currentPhoto); + int audioIndex = _trackInfo.getAudioList().getAudioIndex(currentPoint.getAudio()); + DataPoint nextTrackPoint = _trackInfo.getTrack().getNextTrackPoint(pointIndex + 1); + // Construct Undo object + UndoOperation undo = new UndoDeletePoint(pointIndex, currentPoint, photoIndex, + audioIndex, nextTrackPoint != null && nextTrackPoint.getSegmentStart()); + // call track to delete point + if (_trackInfo.deletePoint()) { - JOptionPane.showMessageDialog(_frame, - I18nManager.getText("dialog.deleteduplicates.nonefound"), - I18nManager.getText("dialog.deleteduplicates.title"), JOptionPane.INFORMATION_MESSAGE); + // Delete was successful so add undo info to stack + _undoStack.push(undo); + if (currentPhoto != null) + { + // delete photo if necessary + if (deletePhoto) + { + _trackInfo.getPhotoList().deletePhoto(photoIndex); + } + else + { + // decouple photo from point + currentPhoto.setDataPoint(null); + } + UpdateMessageBroker.informSubscribers(DataSubscriber.PHOTOS_MODIFIED); + } + // Delete audio object (without bothering to ask) + if (audioIndex > -1) { + _trackInfo.getAudioList().deleteAudio(audioIndex); + } + // Confirm + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.deletepoint.single")); + UpdateMessageBroker.informSubscribers(DataSubscriber.DATA_ADDED_OR_REMOVED); } } } /** - * Compress the track + * Finish the compression by deleting the marked points */ - public void compressTrack() + public void finishCompressTrack() { - UndoCompress undo = new UndoCompress(_track); - // Get compression parameter - Object compParam = JOptionPane.showInputDialog(_frame, - I18nManager.getText("dialog.compresstrack.parameter.text"), - I18nManager.getText("dialog.compresstrack.title"), - JOptionPane.QUESTION_MESSAGE, null, null, "100"); - int compNumber = parseNumber(compParam); - if (compNumber <= 0) return; + UndoDeleteMarked undo = new UndoDeleteMarked(_track); // call track to do compress - int numPointsDeleted = _trackInfo.compress(compNumber); + int numPointsDeleted = _trackInfo.deleteMarkedPoints(); // add to undo stack if successful if (numPointsDeleted > 0) { undo.setNumPointsDeleted(numPointsDeleted); _undoStack.add(undo); - JOptionPane.showMessageDialog(_frame, - I18nManager.getText("dialog.compresstrack.text") + " - " - + numPointsDeleted + " " - + (numPointsDeleted==1?I18nManager.getText("dialog.compresstrack.single.text"):I18nManager.getText("dialog.compresstrack.multi.text")), - I18nManager.getText("dialog.compresstrack.title"), JOptionPane.INFORMATION_MESSAGE); + UpdateMessageBroker.informSubscribers("" + numPointsDeleted + " " + + (numPointsDeleted==1?I18nManager.getText("confirm.deletepoint.single"):I18nManager.getText("confirm.deletepoint.multi"))); } - else - { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("dialog.compresstrack.nonefound"), - I18nManager.getText("dialog.compresstrack.title"), JOptionPane.WARNING_MESSAGE); + else { + showErrorMessage("function.compress", "dialog.deletemarked.nonefound"); } } - /** - * Reverse a section of the track + * Reverse the currently selected section of the track */ public void reverseRange() { @@ -286,91 +364,194 @@ public class App int selStart = _trackInfo.getSelection().getStart(); int selEnd = _trackInfo.getSelection().getEnd(); if (!_track.hasData(Field.TIMESTAMP, selStart, selEnd) - || _reversePointsConfirmed + || _mangleTimestampsConfirmed || (JOptionPane.showConfirmDialog(_frame, I18nManager.getText("dialog.confirmreversetrack.text"), I18nManager.getText("dialog.confirmreversetrack.title"), - JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION && (_reversePointsConfirmed = true))) + JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION && (_mangleTimestampsConfirmed = true))) { - UndoReverseSection undo = new UndoReverseSection(selStart, selEnd); + UndoReverseSection undo = new UndoReverseSection(_track, selStart, selEnd); // call track to reverse range if (_track.reverseRange(selStart, selEnd)) { _undoStack.add(undo); + // Confirm + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.reverserange")); } } } - /** - * Interpolate the two selected points + * Complete the add time offset function with the specified offset + * @param inTimeOffset time offset to add (+ve for add, -ve for subtract) */ - public void interpolateSelection() + public void finishAddTimeOffset(long inTimeOffset) { - // Get number of points to add - Object numPointsStr = JOptionPane.showInputDialog(_frame, - I18nManager.getText("dialog.interpolate.parameter.text"), - I18nManager.getText("dialog.interpolate.title"), - JOptionPane.QUESTION_MESSAGE, null, null, ""); - int numPoints = parseNumber(numPointsStr); - if (numPoints <= 0) return; - - UndoInsert undo = new UndoInsert(_trackInfo.getSelection().getStart() + 1, - numPoints); - // call track to interpolate - if (_trackInfo.interpolate(numPoints)) + // Construct undo information + int selStart = _trackInfo.getSelection().getStart(); + int selEnd = _trackInfo.getSelection().getEnd(); + UndoAddTimeOffset undo = new UndoAddTimeOffset(selStart, selEnd, inTimeOffset); + if (_trackInfo.getTrack().addTimeOffset(selStart, selEnd, inTimeOffset, false)) { _undoStack.add(undo); + UpdateMessageBroker.informSubscribers(DataSubscriber.DATA_EDITED); + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.addtimeoffset")); } } /** - * Rearrange the waypoints into track order + * Complete the add altitude offset function with the specified offset + * @param inOffset altitude offset to add as String + * @param inFormat altitude format of offset (eg Feet, Metres) */ - public void rearrangeWaypoints(int inFunction) + public void finishAddAltitudeOffset(String inOffset, Altitude.Format inFormat) { - UndoRearrangeWaypoints undo = new UndoRearrangeWaypoints(_track); - boolean success = false; - if (inFunction == REARRANGE_TO_START || inFunction == REARRANGE_TO_END) - { - // Collect the waypoints to the start or end of the track - success = _track.collectWaypoints(inFunction == REARRANGE_TO_START); + // Sanity check + if (inOffset == null || inOffset.equals("") || inFormat==Altitude.Format.NO_FORMAT) { + return; } - else - { - // Interleave the waypoints into track order - success = _track.interleaveWaypoints(); + // Construct undo information + UndoAddAltitudeOffset undo = new UndoAddAltitudeOffset(_trackInfo); + int selStart = _trackInfo.getSelection().getStart(); + int selEnd = _trackInfo.getSelection().getEnd(); + // How many decimal places are given in the offset? + int numDecimals = NumberUtils.getDecimalPlaces(inOffset); + boolean success = false; + // Decimal offset given + try { + double offsetd = Double.parseDouble(inOffset); + success = _trackInfo.getTrack().addAltitudeOffset(selStart, selEnd, offsetd, inFormat, numDecimals); } + catch (NumberFormatException nfe) {} if (success) { _undoStack.add(undo); + _trackInfo.getSelection().markInvalid(); + UpdateMessageBroker.informSubscribers(DataSubscriber.DATA_EDITED); + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.addaltitudeoffset")); } - else + } + + + /** + * Merge the track segments within the current selection + */ + public void mergeTrackSegments() + { + if (_trackInfo.getSelection().hasRangeSelected()) { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.rearrange.noop"), - I18nManager.getText("error.function.noop.title"), JOptionPane.WARNING_MESSAGE); + // Maybe could check segment start flags to see if it's worth merging + // If first track point is already start and no other seg starts then do nothing + + int selStart = _trackInfo.getSelection().getStart(); + int selEnd = _trackInfo.getSelection().getEnd(); + // Make undo object + UndoMergeTrackSegments undo = new UndoMergeTrackSegments(_track, selStart, selEnd); + // Call track to merge segments + if (_trackInfo.mergeTrackSegments(selStart, selEnd)) { + _undoStack.add(undo); + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.mergetracksegments")); + } } } /** - * Open a new window with the 3d view + * Average the selected points */ - public void show3dWindow() + public void averageSelection() { - // TODO: open 3d view window - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.function.notimplemented"), - I18nManager.getText("error.function.notimplemented.title"), JOptionPane.WARNING_MESSAGE); + // Find following track point + DataPoint nextPoint = _track.getNextTrackPoint(_trackInfo.getSelection().getEnd() + 1); + boolean segFlag = false; + if (nextPoint != null) {segFlag = nextPoint.getSegmentStart();} + UndoInsert undo = new UndoInsert(_trackInfo.getSelection().getEnd() + 1, 1, nextPoint != null, segFlag); + // call track info object to do the averaging + if (_trackInfo.average()) + { + _undoStack.add(undo); + } } /** - * Select all points + * Create a new point at the end of the track + * @param inPoint point to add */ - public void selectAll() + public void createPoint(DataPoint inPoint) { - _trackInfo.getSelection().select(0, 0, _track.getNumPoints()-1); + // create undo object + UndoCreatePoint undo = new UndoCreatePoint(); + _undoStack.add(undo); + // add point to track + inPoint.setSegmentStart(true); + _track.appendPoints(new DataPoint[] {inPoint}); + // ensure track's field list contains point's fields + _track.extendFieldList(inPoint.getFieldList()); + _trackInfo.selectPoint(_trackInfo.getTrack().getNumPoints()-1); + // update listeners + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.createpoint")); + } + + + /** + * Create a new point before the given position + * @param inPoint point to add + * @param inIndex index of following point + */ + public void createPoint(DataPoint inPoint, int inIndex) + { + // create undo object + UndoInsert undo = new UndoInsert(inIndex, 1); + _undoStack.add(undo); + // add point to track + _track.insertPoint(inPoint, inIndex); + // ensure track's field list contains point's fields + _track.extendFieldList(inPoint.getFieldList()); + _trackInfo.selectPoint(inIndex); + // update listeners + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.createpoint")); + } + + + /** + * Cut the current selection and move it to before the currently selected point + */ + public void cutAndMoveSelection() + { + int startIndex = _trackInfo.getSelection().getStart(); + int endIndex = _trackInfo.getSelection().getEnd(); + int pointIndex = _trackInfo.getSelection().getCurrentPointIndex(); + // If timestamps would be mangled by cut/move, confirm + if (!_track.hasData(Field.TIMESTAMP, startIndex, endIndex) + || _mangleTimestampsConfirmed + || (JOptionPane.showConfirmDialog(_frame, + I18nManager.getText("dialog.confirmcutandmove.text"), + I18nManager.getText("dialog.confirmcutandmove.title"), + JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION && (_mangleTimestampsConfirmed = true))) + { + // Find points to set segment flags + DataPoint firstTrackPoint = _track.getNextTrackPoint(startIndex, endIndex); + DataPoint nextTrackPoint = _track.getNextTrackPoint(endIndex+1); + DataPoint moveToTrackPoint = _track.getNextTrackPoint(pointIndex); + // Make undo object + UndoCutAndMove undo = new UndoCutAndMove(_track, startIndex, endIndex, pointIndex); + // Call track info to move track section + if (_track.cutAndMoveSection(startIndex, endIndex, pointIndex)) + { + // Set segment start flags (first track point, next track point, move to point) + if (firstTrackPoint != null) {firstTrackPoint.setSegmentStart(true);} + if (nextTrackPoint != null) {nextTrackPoint.setSegmentStart(true);} + if (moveToTrackPoint != null) {moveToTrackPoint.setSegmentStart(true);} + + // Add undo object to stack, set confirm message + _undoStack.add(undo); + _trackInfo.getSelection().selectRange(-1, -1); + UpdateMessageBroker.informSubscribers(); + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.cutandmove")); + } + } } /** @@ -378,53 +559,238 @@ public class App */ public void selectNone() { + // deselect point, range and photo _trackInfo.getSelection().clearAll(); + _track.clearDeletionMarkers(); } /** - * Receive loaded data and optionally merge with current Track + * 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 */ - public void informDataLoaded(Field[] inFieldArray, Object[][] inDataArray, int inAltFormat, String inFilename) + 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(); + loadedTrack.load(inFieldArray, inDataArray, inAltFormat); + if (loadedTrack.getNumPoints() <= 0) + { + showErrorMessage("error.load.dialogtitle", "error.load.nopoints"); + // load next file if there's a queue + loadNextFile(); + return; + } + // Check for doubled track + if (Checker.isDoubledTrack(loadedTrack)) { + 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, loadedTrack, inSourceInfo, inTrackNameList).begin(); + } + else { + // go directly to load + informDataLoaded(loadedTrack, inSourceInfo); + } + setCurrentMode(AppMode.NORMAL); + } + + + /** + * Receive loaded data and optionally merge with current Track + * @param inLoadedTrack loaded track + * @param inSourceInfo information about the source of the data + */ + public void informDataLoaded(Track inLoadedTrack, SourceInfo inSourceInfo) { // Decide whether to load or append - if (_track != null && _track.getNumPoints() > 0) + if (_track.getNumPoints() > 0) { // ask whether to replace or append - int answer = JOptionPane.showConfirmDialog(_frame, - I18nManager.getText("dialog.openappend.text"), - I18nManager.getText("dialog.openappend.title"), - JOptionPane.YES_NO_CANCEL_OPTION); + int answer = 0; + if (_autoAppendNextFile) { + // Automatically append the next file + answer = JOptionPane.YES_OPTION; + } + else { + // Ask whether to append or not + answer = JOptionPane.showConfirmDialog(_frame, + I18nManager.getText("dialog.openappend.text"), + I18nManager.getText("dialog.openappend.title"), + JOptionPane.YES_NO_CANCEL_OPTION); + } + _autoAppendNextFile = false; // reset flag to cancel autoappend + if (answer == JOptionPane.YES_OPTION) { // append data to current Track - Track loadedTrack = new Track(_broker); - loadedTrack.load(inFieldArray, inDataArray, inAltFormat); - _undoStack.add(new UndoLoad(_track.getNumPoints(), loadedTrack.getNumPoints())); - _track.combine(loadedTrack); - _trackInfo.getFileInfo().addFile(); + 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()); + _trackInfo.getFileInfo().addSource(inSourceInfo); } else if (answer == JOptionPane.NO_OPTION) { // Don't append, replace data - _undoStack.add(new UndoLoad(_trackInfo, inDataArray.length)); + PhotoList photos = null; + if (_trackInfo.getPhotoList().hasCorrelatedPhotos()) { + photos = _trackInfo.getPhotoList().cloneList(); + } + UndoLoad undo = new UndoLoad(_trackInfo, inLoadedTrack.getNumPoints(), photos); + undo.setNumPhotosAudios(_trackInfo.getPhotoList().getNumPhotos(), _trackInfo.getAudioList().getNumAudios()); + _undoStack.add(undo); _lastSavePosition = _undoStack.size(); - _trackInfo.loadTrack(inFieldArray, inDataArray, inAltFormat); - _trackInfo.getFileInfo().setFile(inFilename); + _trackInfo.getSelection().clearAll(); + _track.load(inLoadedTrack); + inSourceInfo.populatePointObjects(_track, _track.getNumPoints()); + _trackInfo.getFileInfo().replaceSource(inSourceInfo); + _trackInfo.getPhotoList().removeCorrelatedPhotos(); + _trackInfo.getAudioList().removeCorrelatedAudios(); } } else { - // currently no data held, so use received data - _undoStack.add(new UndoLoad(_trackInfo, inDataArray.length)); + // Currently no data held, so transfer received data + UndoLoad undo = new UndoLoad(_trackInfo, inLoadedTrack.getNumPoints(), null); + undo.setNumPhotosAudios(_trackInfo.getPhotoList().getNumPhotos(), _trackInfo.getAudioList().getNumAudios()); + _undoStack.add(undo); _lastSavePosition = _undoStack.size(); - _trackInfo.loadTrack(inFieldArray, inDataArray, inAltFormat); - _trackInfo.getFileInfo().setFile(inFilename); + _trackInfo.getSelection().clearAll(); + _track.load(inLoadedTrack); + inSourceInfo.populatePointObjects(_track, _track.getNumPoints()); + _trackInfo.getFileInfo().addSource(inSourceInfo); } - _broker.informSubscribers(); + // 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(); + } + + /** + * Inform the app that NO data was loaded, eg cancel pressed + * Only needed if there's another file waiting in the queue + */ + public void informNoDataLoaded() + { + // Load next file if there's a queue + loadNextFile(); + } + + /** + * External trigger to automatically append the next loaded file + * instead of prompting to replace or append + */ + public void autoAppendNextFile() + { + _autoAppendNextFile = true; + } + + /** + * Load the next file in the waiting list, if any + */ + private void loadNextFile() + { + if (_dataFiles == null || _dataFiles.size() == 0) { + _dataFiles = null; + } + else { + new Thread(new Runnable() { + public void run() { + File f = _dataFiles.get(0); + _dataFiles.remove(0); + _autoAppendNextFile = true; + _fileLoader.openFile(f); + } + }).start(); + } + } + + + /** + * Accept a list of loaded photos + * @param inPhotoSet Set of Photo objects + */ + public void informPhotosLoaded(Set inPhotoSet) + { + if (inPhotoSet != null && !inPhotoSet.isEmpty()) + { + int[] numsAdded = _trackInfo.addPhotos(inPhotoSet); + int numPhotosAdded = numsAdded[0]; + int numPointsAdded = numsAdded[1]; + if (numPhotosAdded > 0) + { + // Save numbers so load can be undone + _undoStack.add(new UndoLoadPhotos(numPhotosAdded, numPointsAdded)); + } + if (numPhotosAdded == 1) { + UpdateMessageBroker.informSubscribers("" + numPhotosAdded + " " + I18nManager.getText("confirm.jpegload.single")); + } + else { + UpdateMessageBroker.informSubscribers("" + numPhotosAdded + " " + I18nManager.getText("confirm.jpegload.multi")); + } + // MAYBE: Improve message when photo(s) fail to load (eg already added) + UpdateMessageBroker.informSubscribers(); + // update menu + if (numPointsAdded > 0) _menuManager.informFileLoaded(); + } + } + + + /** + * Save the coordinates of photos in their exif data + */ + public void saveExif() + { + ExifSaver saver = new ExifSaver(_frame); + saver.saveExifInformation(_trackInfo.getPhotoList()); } @@ -444,6 +810,7 @@ public class App { if (_undoStack.isEmpty()) { + // Nothing to undo JOptionPane.showMessageDialog(_frame, I18nManager.getText("dialog.undo.none.text"), I18nManager.getText("dialog.undo.none.title"), JOptionPane.INFORMATION_MESSAGE); } @@ -474,7 +841,7 @@ public class App _undoStack.clear(); _lastSavePosition = 0; if (unsaved) _lastSavePosition = -1; - _broker.informSubscribers(); + UpdateMessageBroker.informSubscribers(); } } @@ -489,43 +856,99 @@ public class App { for (int i=0; i