Version 19.2, December 2018

Author: activityworkshop

README.md

@@ -3,5 +3,5 @@ GpsPrune is a map-based application for viewing, editing and converting coordina
 
 It's a cross-platform java application, and its home page is at https://gpsprune.activityworkshop.net .
 
-Here on github you'll find all the sources from version 1 to the current version 19, and in the wiki at https://github.com/activityworkshop/GpsPrune/wiki there's the beginning of a translation effort for anyone to contribute.
+Here on github you'll find all the sources from version 1 to the current version 19.2, and in the wiki at https://github.com/activityworkshop/GpsPrune/wiki there's the beginning of a translation effort for anyone to contribute.
 Currently just the Spanish translations are online, to see whether it's a workable idea or not.  Please help with this if you can.

tim/prune/GpsPrune.java

@@ -1,14 +1,14 @@
 package tim.prune;
 
-import java.awt.event.WindowAdapter;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Image;
+import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.util.Locale;
 import java.util.ArrayList;
+import java.util.Locale;
 import javax.swing.JFrame;
 import javax.swing.JSplitPane;
 import javax.swing.JToolBar;
@@ -17,10 +17,10 @@
 import tim.prune.config.Config;
 import tim.prune.config.ConfigException;
 import tim.prune.gui.DetailsDisplay;
-import tim.prune.gui.SidebarController;
 import tim.prune.gui.IconManager;
 import tim.prune.gui.MenuManager;
 import tim.prune.gui.SelectorDisplay;
+import tim.prune.gui.SidebarController;
 import tim.prune.gui.StatusBar;
 import tim.prune.gui.Viewport;
 import tim.prune.gui.map.MapCanvas;
@@ -36,9 +36,9 @@
 public class GpsPrune
 {
 	/** Version number of application, used in about screen and for version check */
-	public static final String VERSION_NUMBER = "19.1";
+	public static final String VERSION_NUMBER = "19.2";
 	/** Build number, just used for about screen */
-	public static final String BUILD_NUMBER = "363c";
+	public static final String BUILD_NUMBER = "363d";
 	/** Static reference to App object */
 	private static App APP = null;
 

tim/prune/config/Config.java

@@ -238,7 +238,9 @@ private static int parseInt(String inString)
 		return val;
 	}
 
-	/** @return File from which config was loaded (or null) */
+	/**
+	 * @return File from which config was loaded (or null)
+	 */
 	public static File getConfigFile()
 	{
 		return _configFile;

tim/prune/data/AltitudeRange.java

@@ -126,16 +126,6 @@ else if (overallDn)
 				_previousValue = altValue;
 				_gotPreviousValue = true;
 			}
-
-//			if (!_empty)
-//			{
-//				if (altValue > _previousValue)
-//					_climb += (altValue - _previousValue);
-//				else
-//					_descent += (_previousValue - altValue);
-//			}
-//			_previousValue = altValue;
-//			_empty = false;
 		}
 	}
 

tim/prune/data/FileInfo.java

@@ -68,16 +68,18 @@ public int getNumFiles()
 	 */
 	public String getFilename()
 	{
-		if (getNumFiles() == 1)
+		if (getNumFiles() == 1) {
 			return _sources.get(0).getName();
+		}
 		return "";
 	}
 
 	/**
-	 * @param inIndex index number
+	 * @param inIndex index number, starting from zero
 	 * @return source info object
 	 */
-	public SourceInfo getSource(int inIndex) {
+	public SourceInfo getSource(int inIndex)
+	{
 		return _sources.get(inIndex);
 	}
 
@@ -88,14 +90,52 @@ public SourceInfo getSource(int inIndex) {
 	 */
 	public SourceInfo getSourceForPoint(DataPoint inPoint)
 	{
-		for (SourceInfo source : _sources) {
+		for (SourceInfo source : _sources)
+		{
 			if (source.getIndex(inPoint) >= 0) {
 				return source;
 			}
 		}
 		return null;
 	}
 
+	/**
+	 * @return the info about the last file loaded, if any
+	 */
+	public SourceInfo getLastFileInfo()
+	{
+		if (getNumFiles() == 0)
+		{
+			return null;
+		}
+		return getSource(getNumFiles()-1);
+	}
+
+	/**
+	 * @return the most recent file title loaded, if any
+	 */
+	public String getLastFileTitle()
+	{
+		final int numFiles = getNumFiles();
+		if (numFiles == 0)
+		{
+			return null;
+		}
+		for (int i=(numFiles-1); i>=0; i--)
+		{
+			SourceInfo info = getSource(i);
+			if (info != null)
+			{
+				String title = info.getFileTitle();
+				if (title != null && !title.equals(""))
+				{
+					return title;
+				}
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * Clone contents of file info
 	 */

tim/prune/data/RangeStats.java

@@ -21,7 +21,7 @@ public class RangeStats
 	private boolean _timesIncomplete = false;
 	private boolean _timesOutOfSequence = false;
 	private double _totalDistanceRads = 0.0, _movingDistanceRads = 0.0;
-	// Note, maximum speed is not calculated here, use the SpeedData method instead
+	// Note, maximum speed is not calculated here, use the SpeedData class instead
 
 	private static final double STEEP_ANGLE = 0.15; // gradient steeper than 15% counts as steep
 
@@ -50,7 +50,8 @@ public RangeStats(Track inTrack, int inStartIndex, int inEndIndex)
 	 */
 	private boolean calculateStats(Track inTrack, int inStartIndex, int inEndIndex)
 	{
-		_startIndex = inStartIndex;  _endIndex = inEndIndex;
+		_startIndex = inStartIndex;
+		_endIndex = inEndIndex;
 		_numPoints = inEndIndex - inStartIndex + 1;
 		_totalAltitudeRange  = new AltitudeRange();
 		_movingAltitudeRange = new AltitudeRange();
@@ -70,7 +71,9 @@ private boolean calculateStats(Track inTrack, int inStartIndex, int inEndIndex)
 			// ignore all waypoints
 			if (p.isWaypoint()) continue;
 
-			if (p.getSegmentStart()) {_numSegments++;}
+			if (p.getSegmentStart()) {
+				_numSegments++;
+			}
 			// Get the distance to the previous track point
 			if (prevPoint != null)
 			{

tim/prune/data/SourceInfo.java

@@ -17,6 +17,8 @@ public enum FILE_TYPE {TEXT, GPX, KML, NMEA, GPSBABEL, GPSIES, JSON};
 	private String _sourceName = null;
 	/** File type */
 	private FILE_TYPE _fileType = null;
+	/** File title, if any */
+	private String _fileTitle = null;
 
 	/** Array of datapoints */
 	private DataPoint[] _points = null;
@@ -50,6 +52,14 @@ public SourceInfo(String inName, FILE_TYPE inType)
 		_fileType = inType;
 	}
 
+	/**
+	 * @param inTitle title of file, eg from <name> tag in gpx
+	 */
+	public void setFileTitle(String inTitle)
+	{
+		_fileTitle = inTitle;
+	}
+
 	/**
 	 * @return source file
 	 */
@@ -74,6 +84,14 @@ public FILE_TYPE getFileType()
 		return _fileType;
 	}
 
+	/**
+	 * @return title of file
+	 */
+	public String getFileTitle()
+	{
+		return _fileTitle;
+	}
+
 	/**
 	 * @return number of points from this source
 	 */

tim/prune/data/TimestampLocal.java

@@ -91,14 +91,17 @@ protected boolean hasMilliseconds()
 	/**
 	 * Utility method for formatting dates / times
 	 * @param inFormat formatter object
-	 * @param inTimezone timezone to use
+	 * @param inTimezone timezone to use, or null
 	 * @return formatted String
 	 */
 	@Override
 	protected String format(DateFormat inFormat, TimeZone inTimezone)
 	{
 		Calendar cal = getCalendar(inTimezone);
-		inFormat.setTimeZone(inTimezone);
+		if (inTimezone != null)
+		{
+			inFormat.setTimeZone(inTimezone);
+		}
 		return inFormat.format(cal.getTime());
 	}
 }

tim/prune/data/TrackInfo.java

@@ -306,7 +306,8 @@ public boolean mergeTrackSegments(int inStart, int inEnd)
 	{
 		boolean firstTrackPoint = true;
 		// Loop between start and end
-		for (int i=inStart; i<=inEnd; i++) {
+		for (int i=inStart; i<=inEnd; i++)
+		{
 			DataPoint point = _track.getPoint(i);
 			// Set all segments to false apart from first track point
 			if (point != null && !point.isWaypoint()) {
@@ -316,7 +317,9 @@ public boolean mergeTrackSegments(int inStart, int inEnd)
 		}
 		// Find following track point, if any
 		DataPoint nextPoint = _track.getNextTrackPoint(inEnd+1);
-		if (nextPoint != null) {nextPoint.setSegmentStart(true);}
+		if (nextPoint != null) {
+			nextPoint.setSegmentStart(true);
+		}
 		_selection.markInvalid();
 		UpdateMessageBroker.informSubscribers();
 		return true;
@@ -353,8 +356,10 @@ public void selectPoint(DataPoint inPoint)
 	public void incrementPointIndex(int inPointIncrement)
 	{
 		int index = _selection.getCurrentPointIndex() + inPointIncrement;
-		if (index < 0) index = 0;
-		else if (index >= _track.getNumPoints()) index = _track.getNumPoints()-1;
+		if (index < 0)
+			index = 0;
+		else if (index >= _track.getNumPoints())
+			index = _track.getNumPoints()-1;
 		selectPoint(index);
 	}
 
@@ -364,7 +369,9 @@ public void incrementPointIndex(int inPointIncrement)
 	 */
 	public void selectPoint(int inPointIndex)
 	{
-		if (_selection.getCurrentPointIndex() == inPointIndex || inPointIndex >= _track.getNumPoints()) {return;}
+		if (_selection.getCurrentPointIndex() == inPointIndex || inPointIndex >= _track.getNumPoints()) {
+			return;
+		}
 		DataPoint selectedPoint = _track.getPoint(inPointIndex);
 		// get the index of the current photo
 		int photoIndex = _selection.getCurrentPhotoIndex();
@@ -397,7 +404,9 @@ else if (audioIndex < 0 || _audioList.getAudio(audioIndex).isConnected()) {
 	 */
 	public void selectPhoto(int inPhotoIndex)
 	{
-		if (_selection.getCurrentPhotoIndex() == inPhotoIndex) {return;}
+		if (_selection.getCurrentPhotoIndex() == inPhotoIndex) {
+			return;
+		}
 		// Photo is primary selection here, not as a result of a point selection
 		// Therefore the photo selection takes priority, deselecting point if necessary
 		// Find Photo object
@@ -426,11 +435,13 @@ public void selectPhoto(int inPhotoIndex)
 		// Has the new point got an audio clip?
 		DataPoint selectedPoint = _track.getPoint(pointIndex);
 		int audioIndex = _selection.getCurrentAudioIndex();
-		if (selectedPoint != null && selectedPoint.getAudio() != null) {
+		if (selectedPoint != null && selectedPoint.getAudio() != null)
+		{
 			// New point has an audio, so select it
 			audioIndex = _audioList.getAudioIndex(selectedPoint.getAudio());
 		}
-		else if (currPoint != null && selectedPoint != currPoint && currPoint.getAudio() != null) {
+		else if (currPoint != null && selectedPoint != currPoint && currPoint.getAudio() != null)
+		{
 			// Old point had an audio, so deselect it
 			audioIndex = -1;
 		}
@@ -444,7 +455,9 @@ else if (currPoint != null && selectedPoint != currPoint && currPoint.getAudio()
 	 */
 	public void selectAudio(int inAudioIndex)
 	{
-		if (_selection.getCurrentAudioIndex() == inAudioIndex) {return;}
+		if (_selection.getCurrentAudioIndex() == inAudioIndex) {
+			return;
+		}
 		// Audio selection takes priority, deselecting point if necessary
 		AudioClip audio = _audioList.getAudio(inAudioIndex);
 		int pointIndex = _selection.getCurrentPointIndex();