X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2FApp.java;h=88cafea3cd1901e23949ccba07579f3bdeabe8d4;hb=140e9d165f85c3d4f0435a311e091209313faa2a;hp=091a37cb4a70bb1e8f149c1cb286a9098c7f26f3;hpb=112bb0c9b46894adca9a33ed8c99ea712b253185;p=GpsPrune.git diff --git a/tim/prune/App.java b/tim/prune/App.java index 091a37c..88cafea 100644 --- a/tim/prune/App.java +++ b/tim/prune/App.java @@ -1,35 +1,37 @@ package tim.prune; +import java.io.File; import java.util.ArrayList; import java.util.EmptyStackException; import java.util.Set; import java.util.Stack; -import java.io.File; import javax.swing.JFrame; import javax.swing.JOptionPane; import tim.prune.data.Altitude; -import tim.prune.data.Coordinate; +import tim.prune.data.Checker; 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.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.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.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.undo.*; @@ -46,6 +48,7 @@ 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; @@ -178,7 +181,7 @@ public class App else { if (_fileSaver == null) { - _fileSaver = new FileSaver(this, _frame, _track); + _fileSaver = new FileSaver(this, _frame); } char delim = ','; if (_fileLoader != null) {delim = _fileLoader.getLastUsedDelimiter();} @@ -239,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 @@ -449,7 +452,7 @@ public class App int selStart = _trackInfo.getSelection().getStart(); int selEnd = _trackInfo.getSelection().getEnd(); UndoAddTimeOffset undo = new UndoAddTimeOffset(selStart, selEnd, inTimeOffset); - if (_trackInfo.getTrack().addTimeOffset(selStart, selEnd, inTimeOffset)) + if (_trackInfo.getTrack().addTimeOffset(selStart, selEnd, inTimeOffset, false)) { _undoStack.add(undo); UpdateMessageBroker.informSubscribers(DataSubscriber.DATA_EDITED); @@ -485,6 +488,7 @@ public class App if (success) { _undoStack.add(undo); + _trackInfo.getSelection().markInvalid(); UpdateMessageBroker.informSubscribers(DataSubscriber.DATA_EDITED); UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.addaltitudeoffset")); } @@ -556,21 +560,20 @@ public class App /** - * Create a new point at the given lat/long coordinates - * @param inLat latitude - * @param inLong longitude + * Create a new point at the given position + * @param inPoint point to add */ - public void createPoint(double inLat, double inLong) + public void createPoint(DataPoint inPoint) { // create undo object UndoCreatePoint undo = new UndoCreatePoint(); - // create point and add to track - DataPoint point = new DataPoint(new Latitude(inLat, Coordinate.FORMAT_NONE), new Longitude(inLong, Coordinate.FORMAT_NONE), null); - point.setSegmentStart(true); - _track.appendPoints(new DataPoint[] {point}); - _trackInfo.selectPoint(_trackInfo.getTrack().getNumPoints()-1); - // add undo object to stack _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")); } @@ -626,14 +629,28 @@ public class App } /** - * Receive loaded data and optionally merge with current Track + * 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 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, Altitude.Format 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(); @@ -645,6 +662,31 @@ public class App 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.getNumPoints() > 0) { @@ -663,33 +705,26 @@ public class App 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(); _trackInfo.getSelection().clearAll(); - _track.load(loadedTrack); - _trackInfo.getFileInfo().setFile(inFilename); - if (photos != null) - { + _track.load(inLoadedTrack); + inSourceInfo.populatePointObjects(_track, _track.getNumPoints()); + _trackInfo.getFileInfo().replaceSource(inSourceInfo); + if (photos != null) { _trackInfo.getPhotoList().removeCorrelatedPhotos(); } } @@ -697,15 +732,17 @@ public class App else { // Currently no data held, so transfer received data - _undoStack.add(new UndoLoad(_trackInfo, inDataArray.length, null)); + _undoStack.add(new UndoLoad(_trackInfo, inLoadedTrack.getNumPoints(), null)); _lastSavePosition = _undoStack.size(); _trackInfo.getSelection().clearAll(); - _track.load(loadedTrack); - _trackInfo.getFileInfo().setFile(inFilename); + _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 @@ -759,12 +796,10 @@ 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")); } // MAYBE: Improve message when photo(s) fail to load (eg already added) @@ -784,29 +819,7 @@ public class App DataPoint point = _trackInfo.getCurrentPoint(); if (photo != null && point != null) { - if (point.getPhoto() != null) - { - // point already has a photo, confirm cloning of new point - if (JOptionPane.showConfirmDialog(_frame, - I18nManager.getText("dialog.connectphoto.clonepoint"), - I18nManager.getText("dialog.connect.title"), - JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) - { - // Create undo, clone point and attach - int pointIndex = _trackInfo.getSelection().getCurrentPointIndex() + 1; - // insert new point after current one - point = point.clonePoint(); - UndoConnectPhotoWithClone undo = new UndoConnectPhotoWithClone( - point, photo.getFile().getName(), pointIndex); - _track.insertPoint(point, pointIndex); - photo.setDataPoint(point); - point.setPhoto(photo); - _undoStack.add(undo); - UpdateMessageBroker.informSubscribers(DataSubscriber.SELECTION_CHANGED); - UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.photo.connect")); - } - } - else + if (point.getPhoto() == null) { // point doesn't currently have a photo, so just connect it _undoStack.add(new UndoConnectPhoto(point, photo.getFile().getName())); @@ -1037,4 +1050,21 @@ public class App { return _viewport; } + + /** + * Set the controller for the full screen mode + * @param inController controller object + */ + public void setSidebarController(SidebarController inController) + { + __sidebarController = inController; + } + + /** + * Toggle sidebars on and off + */ + public void toggleSidebars() + { + __sidebarController.toggle(); + } }