X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2FApp.java;h=88cafea3cd1901e23949ccba07579f3bdeabe8d4;hb=140e9d165f85c3d4f0435a311e091209313faa2a;hp=cb532dbf9d6bcb10a0dfb72ea756b1ac26f1a2b3;hpb=ca9bdb3916f9c39adbbf95d06ac95c21dafbb4e6;p=GpsPrune.git diff --git a/tim/prune/App.java b/tim/prune/App.java index cb532db..88cafea 100644 --- a/tim/prune/App.java +++ b/tim/prune/App.java @@ -1,5 +1,7 @@ package tim.prune; +import java.io.File; +import java.util.ArrayList; import java.util.EmptyStackException; import java.util.Set; import java.util.Stack; @@ -7,49 +9,32 @@ import java.util.Stack; import javax.swing.JFrame; import javax.swing.JOptionPane; -import tim.prune.browser.BrowserLauncher; -import tim.prune.browser.UrlGenerator; -import tim.prune.correlate.PhotoCorrelator; -import tim.prune.correlate.PointPair; +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.SourceInfo; import tim.prune.data.Track; import tim.prune.data.TrackInfo; -import tim.prune.edit.FieldEditList; -import tim.prune.edit.PointEditor; -import tim.prune.edit.PointNameEditor; +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.UndoManager; -import tim.prune.gui.map.MapWindow; +import tim.prune.gui.Viewport; import tim.prune.load.FileLoader; import tim.prune.load.JpegLoader; +import tim.prune.load.TrackNameList; import tim.prune.save.ExifSaver; import tim.prune.save.FileSaver; -import tim.prune.save.GpxExporter; -import tim.prune.save.KmlExporter; -import tim.prune.save.PovExporter; -import tim.prune.threedee.ThreeDException; -import tim.prune.threedee.ThreeDWindow; -import tim.prune.threedee.WindowFactory; -import tim.prune.undo.UndoCompress; -import tim.prune.undo.UndoConnectPhoto; -import tim.prune.undo.UndoCorrelatePhotos; -import tim.prune.undo.UndoDeleteDuplicates; -import tim.prune.undo.UndoDeletePhoto; -import tim.prune.undo.UndoDeletePoint; -import tim.prune.undo.UndoDeleteRange; -import tim.prune.undo.UndoDisconnectPhoto; -import tim.prune.undo.UndoEditPoint; -import tim.prune.undo.UndoException; -import tim.prune.undo.UndoInsert; -import tim.prune.undo.UndoLoad; -import tim.prune.undo.UndoLoadPhotos; -import tim.prune.undo.UndoMergeTrackSegments; -import tim.prune.undo.UndoOperation; -import tim.prune.undo.UndoRearrangeWaypoints; -import tim.prune.undo.UndoReverseSection; +import tim.prune.undo.*; /** @@ -63,20 +48,15 @@ public class App private TrackInfo _trackInfo = null; private int _lastSavePosition = 0; private MenuManager _menuManager = null; + private SidebarController __sidebarController = null; private FileLoader _fileLoader = null; private JpegLoader _jpegLoader = null; private FileSaver _fileSaver = null; - private KmlExporter _kmlExporter = null; - private GpxExporter _gpxExporter = null; - private PovExporter _povExporter = null; - private BrowserLauncher _browserLauncher = null; - private Stack _undoStack = null; - private boolean _reversePointsConfirmed = false; - - // 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; + private Stack _undoStack = null; + private boolean _mangleTimestampsConfirmed = false; + private Viewport _viewport = null; + private ArrayList _dataFiles = null; + private boolean _firstDataFile = true; /** @@ -86,9 +66,10 @@ public class App public App(JFrame inFrame) { _frame = inFrame; - _undoStack = new Stack(); + _undoStack = new Stack(); _track = new Track(); _trackInfo = new TrackInfo(_track); + FunctionLibrary.initialise(this); } @@ -100,6 +81,14 @@ 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 @@ -113,11 +102,43 @@ public class App /** * @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); + _firstDataFile = true; + _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); + } + /** * Set the MenuManager object to be informed about changes * @param inManager MenuManager object @@ -146,125 +167,25 @@ public class App { if (_jpegLoader == null) _jpegLoader = new JpegLoader(this, _frame); - _jpegLoader.openDialog(); + _jpegLoader.openDialog(new LatLonRectangle(_track.getLatRange(), _track.getLonRange())); } - /** * Save the file in the selected format */ 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 { if (_fileSaver == null) { - _fileSaver = new FileSaver(this, _frame, _track); - } - _fileSaver.showDialog(_fileLoader.getLastUsedDelimiter()); - } - } - - - /** - * Export track data as Kml - */ - public void exportKml() - { - if (_track == null) - { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.save.nodata"), - I18nManager.getText("error.save.dialogtitle"), JOptionPane.ERROR_MESSAGE); - } - else - { - // Invoke the export - if (_kmlExporter == null) - { - _kmlExporter = new KmlExporter(_frame, _trackInfo); - } - _kmlExporter.showDialog(); - } - } - - - /** - * Export track data as Gpx - */ - public void exportGpx() - { - if (_track == null) - { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.save.nodata"), - I18nManager.getText("error.save.dialogtitle"), JOptionPane.ERROR_MESSAGE); - } - else - { - // Invoke the export - if (_gpxExporter == null) - { - _gpxExporter = new GpxExporter(_frame, _trackInfo); - } - _gpxExporter.showDialog(); - } - } - - - /** - * Export track data as Pov without specifying settings - */ - public void exportPov() - { - exportPov(false, 0.0, 0.0, 0.0, 0); - } - - /** - * Export track data as Pov and also specify settings - * @param inX X component of unit vector - * @param inY Y component of unit vector - * @param inZ Z component of unit vector - * @param inAltitudeCap altitude cap - */ - public void exportPov(double inX, double inY, double inZ, int inAltitudeCap) - { - exportPov(true, inX, inY, inZ, inAltitudeCap); - } - - /** - * Export track data as Pov with optional angle specification - * @param inDefineAngles true to define angles, false to ignore - * @param inX X component of unit vector - * @param inY Y component of unit vector - * @param inZ Z component of unit vector - * @param inAltitudeCap altitude cap - */ - private void exportPov(boolean inDefineSettings, double inX, double inY, double inZ, int inAltitudeCap) - { - // Check track has data to export - if (_track == null || _track.getNumPoints() <= 0) - { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.save.nodata"), - I18nManager.getText("error.save.dialogtitle"), JOptionPane.ERROR_MESSAGE); - } - else - { - // Make new exporter if necessary - if (_povExporter == null) - { - _povExporter = new PovExporter(_frame, _track); + _fileSaver = new FileSaver(this, _frame); } - // Specify angles if necessary - if (inDefineSettings) - { - _povExporter.setCameraCoordinates(inX, inY, inZ); - _povExporter.setAltitudeCap(inAltitudeCap); - } - // Initiate export - _povExporter.showDialog(); + char delim = ','; + if (_fileLoader != null) {delim = _fileLoader.getLastUsedDelimiter();} + _fileSaver.showDialog(delim); } } @@ -321,7 +242,7 @@ public class App // add information to undo stack UndoOperation undo = new UndoEditPoint(currentPoint, inUndoList); // pass to track for completion - if (_track.editPoint(currentPoint, inEditList)) + if (_track.editPoint(currentPoint, inEditList, false)) { _undoStack.push(undo); // Confirm point edit @@ -331,24 +252,6 @@ public class App } - /** - * Edit the name of the currently selected (way)point - */ - public void editCurrentPointName() - { - if (_track != null) - { - DataPoint currentPoint = _trackInfo.getCurrentPoint(); - if (currentPoint != null) - { - // Open point dialog to display details - PointNameEditor editor = new PointNameEditor(this, _frame); - editor.showDialog(currentPoint); - } - } - } - - /** * Delete the currently selected point */ @@ -493,57 +396,13 @@ public class App /** - * Delete all the duplicate points in the track - */ - public void deleteDuplicates() - { - if (_track != null) - { - // Save undo information - UndoOperation undo = new UndoDeleteDuplicates(_track); - // tell track to do it - int numDeleted = _trackInfo.deleteDuplicates(); - if (numDeleted > 0) - { - _undoStack.add(undo); - String message = null; - if (numDeleted == 1) - { - message = "1 " + I18nManager.getText("confirm.deleteduplicates.single"); - } - else - { - message = "" + numDeleted + " " + I18nManager.getText("confirm.deleteduplicates.multi"); - } - // Pass message to broker - UpdateMessageBroker.informSubscribers(message); - } - else - { - // No duplicates found to delete - JOptionPane.showMessageDialog(_frame, - I18nManager.getText("dialog.deleteduplicates.nonefound"), - I18nManager.getText("dialog.deleteduplicates.title"), JOptionPane.INFORMATION_MESSAGE); - } - } - } - - - /** - * 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; // call track to do compress - int numPointsDeleted = _trackInfo.compress(compNumber); + int numPointsDeleted = _trackInfo.deleteMarkedPoints(); // add to undo stack if successful if (numPointsDeleted > 0) { @@ -552,14 +411,11 @@ public class App 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.compress.nonefound"); } } - /** * Reverse the currently selected section of the track */ @@ -569,11 +425,11 @@ 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(_track, selStart, selEnd); // call track to reverse range @@ -586,6 +442,59 @@ public class App } } + /** + * Complete the add time offset function with the specified offset + * @param inTimeOffset time offset to add (+ve for add, -ve for subtract) + */ + public void finishAddTimeOffset(long inTimeOffset) + { + // 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")); + } + } + + + /** + * 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 finishAddAltitudeOffset(String inOffset, Altitude.Format inFormat) + { + // Sanity check + if (inOffset == null || inOffset.equals("") || inFormat==Altitude.Format.NO_FORMAT) { + return; + } + // 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")); + } + } + + /** * Merge the track segments within the current selection */ @@ -601,7 +510,7 @@ public class App // Make undo object UndoMergeTrackSegments undo = new UndoMergeTrackSegments(_track, selStart, selEnd); // Call track to merge segments - if (_track.mergeTrackSegments(selStart, selEnd)) { + if (_trackInfo.mergeTrackSegments(selStart, selEnd)) { _undoStack.add(undo); UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.mergetracksegments")); } @@ -633,69 +542,80 @@ public class App /** - * Rearrange the waypoints into track order - * @param inFunction nearest point, all to end or all to start + * Average the selected points */ - public void rearrangeWaypoints(int inFunction) + public void averageSelection() { - 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); - } - else - { - // Interleave the waypoints into track order - success = _track.interleaveWaypoints(); - } - if (success) + // 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); } - else - { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.rearrange.noop"), - I18nManager.getText("error.function.noop.title"), JOptionPane.WARNING_MESSAGE); - } } /** - * Open a new window with the 3d view + * Create a new point at the given position + * @param inPoint point to add */ - public void show3dWindow() + public void createPoint(DataPoint inPoint) { - ThreeDWindow window = WindowFactory.getWindow(this, _frame); - if (window == null) - { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.function.nojava3d"), - I18nManager.getText("error.function.notavailable.title"), JOptionPane.WARNING_MESSAGE); - } - else - { - try - { - // Pass the track object and show the window - window.setTrack(_track); - window.show(); - } - catch (ThreeDException e) - { - JOptionPane.showMessageDialog(_frame, I18nManager.getText("error.3d") + ": " + e.getMessage(), - I18nManager.getText("error.3d.title"), JOptionPane.ERROR_MESSAGE); - } - } + // 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")); } /** - * Select all points + * Cut the current selection and move it to before the currently selected point */ - public void selectAll() + public void cutAndMoveSelection() { - _trackInfo.getSelection().select(0, 0, _track.getNumPoints()-1); + 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")); + } + } } /** @@ -705,85 +625,158 @@ public class App { // deselect point, range and photo _trackInfo.getSelection().clearAll(); + _track.clearDeletionMarkers(); } + /** + * Receive loaded data and start load + * @param inFieldArray array of fields + * @param inDataArray array of data + * @param inAltFormat altitude format + * @param inSourceInfo information about the source of the data + */ + public void informDataLoaded(Field[] inFieldArray, Object[][] inDataArray, + Altitude.Format inAltFormat, SourceInfo inSourceInfo) + { + informDataLoaded(inFieldArray, inDataArray, inAltFormat, inSourceInfo, null); + } /** - * 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 inFilename filename used + * @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) { // Check whether loaded array can be properly parsed into a Track Track loadedTrack = new Track(); loadedTrack.load(inFieldArray, inDataArray, inAltFormat); if (loadedTrack.getNumPoints() <= 0) { - JOptionPane.showMessageDialog(_frame, - I18nManager.getText("error.load.nopoints"), - I18nManager.getText("error.load.dialogtitle"), - JOptionPane.ERROR_MESSAGE); + 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); + } + // 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(); + } + else { + // go directly to load + informDataLoaded(loadedTrack, inSourceInfo); + } + } + + /** + * 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 (_dataFiles == null || _firstDataFile) { + answer = JOptionPane.showConfirmDialog(_frame, + I18nManager.getText("dialog.openappend.text"), + I18nManager.getText("dialog.openappend.title"), + JOptionPane.YES_NO_CANCEL_OPTION); + } + else { + // Automatically append if there's a file load queue + answer = JOptionPane.YES_OPTION; + } if (answer == JOptionPane.YES_OPTION) { // append data to current Track - _undoStack.add(new UndoLoad(_track.getNumPoints(), loadedTrack.getNumPoints())); - _track.combine(loadedTrack); - // set filename if currently empty - if (_trackInfo.getFileInfo().getNumFiles() == 0) - { - _trackInfo.getFileInfo().setFile(inFilename); - } - else - { - _trackInfo.getFileInfo().addFile(); - } + _undoStack.add(new UndoLoad(_track.getNumPoints(), inLoadedTrack.getNumPoints())); + _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 PhotoList photos = null; - if (_trackInfo.getPhotoList().hasCorrelatedPhotos()) - { + if (_trackInfo.getPhotoList().hasCorrelatedPhotos()) { photos = _trackInfo.getPhotoList().cloneList(); } - _undoStack.add(new UndoLoad(_trackInfo, inDataArray.length, photos)); + _undoStack.add(new UndoLoad(_trackInfo, inLoadedTrack.getNumPoints(), photos)); _lastSavePosition = _undoStack.size(); - // TODO: Should be possible to reuse the Track object already loaded? - _trackInfo.selectPoint(null); - _trackInfo.loadTrack(inFieldArray, inDataArray, inAltFormat); - _trackInfo.getFileInfo().setFile(inFilename); - if (photos != null) - { + _trackInfo.getSelection().clearAll(); + _track.load(inLoadedTrack); + inSourceInfo.populatePointObjects(_track, _track.getNumPoints()); + _trackInfo.getFileInfo().replaceSource(inSourceInfo); + if (photos != null) { _trackInfo.getPhotoList().removeCorrelatedPhotos(); } } } else { - // currently no data held, so use received data - _undoStack.add(new UndoLoad(_trackInfo, inDataArray.length, null)); + // Currently no data held, so transfer received data + _undoStack.add(new UndoLoad(_trackInfo, inLoadedTrack.getNumPoints(), null)); _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); } UpdateMessageBroker.informSubscribers(); // Update status bar - UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.loadfile") + " '" + inFilename + "'"); + UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.loadfile") + + " '" + inSourceInfo.getName() + "'"); // update menu _menuManager.informFileLoaded(); + // 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(); + } + + /** + * Load the next file in the waiting list, if any + */ + private void loadNextFile() + { + _firstDataFile = false; + if (_dataFiles == null || _dataFiles.size() == 0) { + _dataFiles = null; + } + else { + new Thread(new Runnable() { + public void run() { + File f = _dataFiles.get(0); + _dataFiles.remove(0); + _fileLoader.openFile(f); + } + }).start(); + } } @@ -791,7 +784,7 @@ public class App * Accept a list of loaded photos * @param inPhotoSet Set of Photo objects */ - public void informPhotosLoaded(Set inPhotoSet) + public void informPhotosLoaded(Set inPhotoSet) { if (inPhotoSet != null && !inPhotoSet.isEmpty()) { @@ -803,15 +796,13 @@ public class App // Save numbers so load can be undone _undoStack.add(new UndoLoadPhotos(numPhotosAdded, numPointsAdded)); } - if (numPhotosAdded == 1) - { + if (numPhotosAdded == 1) { UpdateMessageBroker.informSubscribers("" + numPhotosAdded + " " + I18nManager.getText("confirm.jpegload.single")); } - else - { + else { UpdateMessageBroker.informSubscribers("" + numPhotosAdded + " " + I18nManager.getText("confirm.jpegload.multi")); } - // TODO: Improve message when photo(s) fail to load (eg already added) + // MAYBE: Improve message when photo(s) fail to load (eg already added) UpdateMessageBroker.informSubscribers(); // update menu _menuManager.informFileLoaded(); @@ -826,14 +817,17 @@ public class App { Photo photo = _trackInfo.getCurrentPhoto(); DataPoint point = _trackInfo.getCurrentPoint(); - if (photo != null && point != null && point.getPhoto() == null) + if (photo != null && point != null) { - // connect - _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")); + 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")); + } } } @@ -901,115 +895,6 @@ public class App } - /** - * Begin the photo correlation process by invoking dialog - */ - public void beginCorrelatePhotos() - { - PhotoCorrelator correlator = new PhotoCorrelator(this, _frame); - // TODO: Do we need to keep a reference to this Photo Correlator object to reuse it later? - correlator.begin(); - } - - - /** - * Finish the photo correlation process - * @param inPointPairs array of PointPair objects describing operation - */ - public void finishCorrelatePhotos(PointPair[] inPointPairs) - { - // TODO: This method is too big for App, but where should it go? - if (inPointPairs != null && inPointPairs.length > 0) - { - // begin to construct undo information - UndoCorrelatePhotos undo = new UndoCorrelatePhotos(_trackInfo); - // loop over Photos - int arraySize = inPointPairs.length; - int i = 0, numPhotos = 0; - int numPointsToCreate = 0; - PointPair pair = null; - for (i=0; i 0) - { - // make new array for added points - DataPoint[] addedPoints = new DataPoint[numPointsToCreate]; - int pointNum = 0; - DataPoint pointToAdd = null; - for (i=0; i 0L) - { - // interpolate point - pointToAdd = DataPoint.interpolate(pair.getPointBefore(), pair.getPointAfter(), pair.getFraction()); - } - if (pointToAdd != null) - { - // link photo to point - pointToAdd.setPhoto(pair.getPhoto()); - pair.getPhoto().setDataPoint(pointToAdd); - // add to point array - addedPoints[pointNum] = pointToAdd; - pointNum++; - } - } - } - // expand track - _track.appendPoints(addedPoints); - } - // add undo information to stack - undo.setNumPhotosCorrelated(numPhotos); - _undoStack.add(undo); - // confirm correlation - UpdateMessageBroker.informSubscribers("" + numPhotos + " " - + (numPhotos==1?I18nManager.getText("confirm.correlate.single"):I18nManager.getText("confirm.correlate.multi"))); - // observers already informed by track update - } - } - - /** * Save the coordinates of photos in their exif data */ @@ -1082,7 +967,7 @@ public class App { for (int i=0; i