diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index eb72c6ef..c4b53bca 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
org.pamguard
Pamguard
Pamguard
- 2.02.13c
+ 2.02.13d
Pamguard using Maven to control dependencies
www.pamguard.org
@@ -172,7 +172,7 @@
- true
+ false
/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk
diff --git a/pom.xml b/pom.xml
index 8ff64b18..2194fb73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
- true
+ false
/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk
diff --git a/src/PamController/PamguardVersionInfo.java b/src/PamController/PamguardVersionInfo.java
index 15c4cf86..e9b6fb3b 100644
--- a/src/PamController/PamguardVersionInfo.java
+++ b/src/PamController/PamguardVersionInfo.java
@@ -16,7 +16,7 @@ public class PamguardVersionInfo {
* @return release type
*/
static public ReleaseType getReleaseType() {
- return ReleaseType.BETA;
+ return ReleaseType.CORE;
}
/**
diff --git a/src/PamView/PamIcon.java b/src/PamView/PamIcon.java
index 03afa104..881a05de 100644
--- a/src/PamView/PamIcon.java
+++ b/src/PamView/PamIcon.java
@@ -26,7 +26,8 @@ public class PamIcon {
//the default is windows. Icon automatically resize on Windows.
- String path = "Resources\\pamguardIcon.png";
+ // Even on Windows, use a / slash. A \\ doesn't work (OK in debugger, not in built version)
+ String path = "Resources/pamguardIcon.png";
if (System.getProperty("os.name").equals("Linux") || System.getProperty("os.name").startsWith("Mac")) {
switch (sizeFlag) {
diff --git a/src/pamScrollSystem/AbstractPamScroller.java b/src/pamScrollSystem/AbstractPamScroller.java
index bc0ba869..8412206a 100644
--- a/src/pamScrollSystem/AbstractPamScroller.java
+++ b/src/pamScrollSystem/AbstractPamScroller.java
@@ -42,7 +42,7 @@ public abstract class AbstractPamScroller implements DataTimeLimits {
/*
* List of play speeds for a quick menu
*/
- protected double[] playSpeeds = {.1, 0.25, .5, 1.0, 2, 5, 10};
+ protected double[] playSpeeds = {.1, 0.25, .5, 1.0, 2, 5, 10, 20, 30, 60};
// private long realTimerStart;
//
diff --git a/src/pamScrollSystem/ViewerScrollerManager.java b/src/pamScrollSystem/ViewerScrollerManager.java
index dba01fae..d999b1a2 100644
--- a/src/pamScrollSystem/ViewerScrollerManager.java
+++ b/src/pamScrollSystem/ViewerScrollerManager.java
@@ -644,7 +644,7 @@ public class ViewerScrollerManager extends AbstractScrollManager implements PamS
newMin = checkMinimumTime(menuMouseTime - scrollRange / 2);
newMax = checkMaximumTime(newMin + scrollRange);
newMin = menuMouseTime - scrollRange/2;
- newMin = checkGapPos(dataBlock, newMin, newMax);
+// newMin = checkGapPos(dataBlock, newMin, newMax); // doesn't work.
newMax = newMin + scrollRange;
System.out.printf("Centering scoller at %s, range %s to %s\n", PamCalendar.formatDBDateTime(menuMouseTime),
PamCalendar.formatDBDateTime(newMin), PamCalendar.formatDBDateTime(newMax));
diff --git a/src/userDisplay/UserDisplayFrame.java b/src/userDisplay/UserDisplayFrame.java
index 1b0900b5..7759bddb 100644
--- a/src/userDisplay/UserDisplayFrame.java
+++ b/src/userDisplay/UserDisplayFrame.java
@@ -31,7 +31,12 @@ public class UserDisplayFrame extends JInternalFrame {
add(userDisplayComponent.getComponent());
setTitle(userDisplayComponent.getFrameTitle());
- setFrameIcon(PamIcon.getPAMGuardImageIcon(PamIcon.SMALL));
+ try {
+ setFrameIcon(PamIcon.getPAMGuardImageIcon(PamIcon.SMALL));
+ }
+ catch (Exception e) {
+ System.out.println(e.getMessage());
+ }
setSize(900, 400);
setVisible(true);