From: Frédéric Perrin <fred@fperrin.net>
Date: Sat, 30 Nov 2019 20:50:19 +0000 (+0000)
Subject: Merge branch 'start-with-editable-map' into fp-integration
X-Git-Tag: v19.2.fp1~3
X-Git-Url: https://gitweb.fperrin.net/?a=commitdiff_plain;h=c92988b0ef22680b27cf0b10898df1e3a70710ea;hp=e215e7b4f3dc812aefac3f8faf4a1b4df7f15075;p=GpsPrune.git

Merge branch 'start-with-editable-map' into fp-integration
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8e9e794
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.class
+*.jar
diff --git a/buildtools/build.sh b/buildtools/build.sh
old mode 100644
new mode 100755
index b38e2ce..c7fcf3d
--- a/buildtools/build.sh
+++ b/buildtools/build.sh
@@ -1,3 +1,4 @@
+set -e
 # Build script
 # Version number
 PRUNENAME=gpsprune_19.2
diff --git a/src/tim/prune/function/edit/PointEditor.java b/src/tim/prune/function/edit/PointEditor.java
index c66201b..546a65e 100644
--- a/src/tim/prune/function/edit/PointEditor.java
+++ b/src/tim/prune/function/edit/PointEditor.java
@@ -307,10 +307,23 @@ public class PointEditor
 			if (_model.getChanged(i))
 			{
 				Field field = fieldList.getField(i);
+				if (field == field.WAYPT_NAME) {
+					if (wasNameAdded(_model.getValue(i))) {
+						_app.createPoint(_point.clonePoint());
+					}
+				}
 				editList.addEdit(new FieldEdit(field, _model.getValue(i)));
 				undoList.addEdit(new FieldEdit(field, _point.getFieldValue(field)));
 			}
 		}
 		_app.completePointEdit(editList, undoList);
 	}
+
+	private boolean wasNameAdded(String newName)
+	{
+		String prevName = _point.getWaypointName();
+		boolean prevNull = (prevName == null || prevName.equals(""));
+		boolean newNull = (newName == null || newName.equals(""));
+		return (prevNull && !newNull);
+	}
 }
diff --git a/src/tim/prune/function/edit/PointNameEditor.java b/src/tim/prune/function/edit/PointNameEditor.java
index 53e1f83..9e6e343 100644
--- a/src/tim/prune/function/edit/PointNameEditor.java
+++ b/src/tim/prune/function/edit/PointNameEditor.java
@@ -206,7 +206,11 @@ public class PointNameEditor extends GenericFunction
 		// Check whether name has really changed
 		if (hasNameChanged())
 		{
-			// Make lists for edit and undo, and add the changed field
+			// If a new name has been added, changing the point
+			// from trackpoint to waypoint, duplicate it
+			_app.createPoint(_point.clonePoint());
+			
+			// make lists for edit and undo, and add the changed field
 			FieldEditList editList = new FieldEditList();
 			FieldEditList undoList = new FieldEditList();
 			editList.addEdit(new FieldEdit(Field.WAYPT_NAME, _nameField.getText().trim()));
@@ -231,4 +235,17 @@ public class PointNameEditor extends GenericFunction
 			|| (!prevNull && newNull)
 			|| (!prevNull && !newNull && !prevName.equals(newName));
 	}
+
+	/**
+	 * Check whether a new name has been added
+	 * @return true if it has indeed
+	 */
+	private boolean wasNameAdded()
+	{
+		String prevName = _point.getWaypointName();
+		String newName = _nameField.getText().trim();
+		boolean prevNull = (prevName == null || prevName.equals(""));
+		boolean newNull = (newName == null || newName.equals(""));
+		return (prevNull && !newNull);
+	}
 }
diff --git a/src/tim/prune/gui/DisplayUtils.java b/src/tim/prune/gui/DisplayUtils.java
index 25640d8..2300296 100644
--- a/src/tim/prune/gui/DisplayUtils.java
+++ b/src/tim/prune/gui/DisplayUtils.java
@@ -36,7 +36,8 @@ public abstract class DisplayUtils
 		if (inNumSecs < 86400L) return "" + (inNumSecs / 60 / 60) + I18nManager.getText("display.range.time.hours")
 			+ " " + ((inNumSecs / 60) % 60) + I18nManager.getText("display.range.time.mins");
 		if (inNumSecs < 432000L) return "" + (inNumSecs / 86400L) + I18nManager.getText("display.range.time.days")
-			+ " " + (inNumSecs / 60 / 60) % 24 + I18nManager.getText("display.range.time.hours");
+			+ " " + (inNumSecs / 60 / 60) % 24 + I18nManager.getText("display.range.time.hours")
+			+ " " + ((inNumSecs / 60) % 60) + I18nManager.getText("display.range.time.mins");
 		if (inNumSecs < 86400000L) return "" + (inNumSecs / 86400L) + I18nManager.getText("display.range.time.days");
 		return "big";
 	}
diff --git a/src/tim/prune/gui/map/MapCanvas.java b/src/tim/prune/gui/map/MapCanvas.java
index 8297e01..ad38d81 100644
--- a/src/tim/prune/gui/map/MapCanvas.java
+++ b/src/tim/prune/gui/map/MapCanvas.java
@@ -92,7 +92,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
 	WpIconDefinition _waypointIconDefinition = null;
 
 	/** Constant for click sensitivity when selecting nearest point */
-	private static final int CLICK_SENSITIVITY = 10;
+	private static final int CLICK_SENSITIVITY = 30;
 	/** Constant for pan distance from key presses */
 	private static final int PAN_DISTANCE = 20;
 	/** Constant for pan distance from autopan */