nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-22 07:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release V2.02.09e

Browse Source 
fixes to WMD stub removal to make it a lot faster.
This commit is contained in:
Douglas Gillespie 2023-12-18 16:48:36 +00:00
parent 291b00e1b1
commit d1b40c1d86
5 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependency-reduced-pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.pamguard</groupId> <groupId>org.pamguard</groupId>
<artifactId>Pamguard</artifactId> <artifactId>Pamguard</artifactId>
<name>Pamguard Java12+</name> <name>Pamguard Java12+</name>
<version>2.02.09c</version> <version>2.02.09e</version>
<description>Pamguard for Java 12+, using Maven to control dependcies</description> <description>Pamguard for Java 12+, using Maven to control dependcies</description>
<url>www.pamguard.org</url> <url>www.pamguard.org</url>
<organization> <organization>

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.pamguard</groupId> <groupId>org.pamguard</groupId>
<artifactId>Pamguard</artifactId> <artifactId>Pamguard</artifactId>
<version>2.02.09d</version> <version>2.02.09e</version>
<name>Pamguard Java12+</name> <name>Pamguard Java12+</name>
<description>Pamguard for Java 12+, using Maven to control dependcies</description> <description>Pamguard for Java 12+, using Maven to control dependcies</description>
<url>www.pamguard.org</url> <url>www.pamguard.org</url>

6
src/PamController/PamguardVersionInfo.java
View File

@ -24,19 +24,19 @@ public class PamguardVersionInfo {
* PAMGuard can work with. * PAMGuard can work with.
*/ */
static public final String minJavaVersion = "11.0.0"; static public final String minJavaVersion = "11.0.0";
static public final String maxJavaVersion = "19.99.99"; static public final String maxJavaVersion = "21.99.99";
/** /**
* Version number, major version.minorversion.sub-release. * Version number, major version.minorversion.sub-release.
* Note: can't go higher than sub-release 'f' * Note: can't go higher than sub-release 'f'
*/ */
static public final String version = "2.02.09c"; static public final String version = "2.02.09e";
/** /**
* Release date * Release date
*/ */
static public final String date = "10 November 2023"; static public final String date = "18 December 2023";
// /** // /**
// * Release type - Beta or Core // * Release type - Beta or Core

20
src/PamView/PamGui.java
View File

@ -601,17 +601,15 @@ public class PamGui extends PamView implements WindowListener, PamSettings {
fileMenu.add(menuItem); fileMenu.add(menuItem);
} }
if (SMRUEnable.isEnable()) { menuItem = new JMenuItem("Import PAMGuard Modules");
menuItem = new JMenuItem("Import PAMGuard Modules"); menuItem.setToolTipText("Import module settings from a different PAMGuard configuration (psfx files only");
menuItem.setToolTipText("Import module settings from a different PAMGuard configuration (psfx files only"); menuItem.addActionListener(new ActionListener() {
menuItem.addActionListener(new ActionListener() { @Override
@Override public void actionPerformed(ActionEvent e) {
public void actionPerformed(ActionEvent e) { importSettings();
importSettings(); }
} });
}); fileMenu.add(menuItem);
fileMenu.add(menuItem);
}
fileMenu.addSeparator(); fileMenu.addSeparator();

8
src/whistlesAndMoans/StubRemover.java
View File

@ -82,7 +82,13 @@ public class StubRemover {
private int searchStubSize(List<SliceData> sliceData, int currentSlice, int peakInd, int searchDir, int diagGap, int currentSize) { private int searchStubSize(List<SliceData> sliceData, int currentSlice, int peakInd, int searchDir, int diagGap, int currentSize) {
int nSlice = sliceData.size(); int nSlice = sliceData.size();
int nextSliceInd = currentSlice + searchDir; int nextSliceInd = currentSlice + searchDir;
if (nextSliceInd < 0 || nextSliceInd >= nSlice-1) { /**
* This function is only every used to throw away very small stubs, so there is no need to get the full size
* of every one. It's OK to return as soon as the size is bigger than the minimum required to make
* something worth keeping. This reduces the time spent tracing down every little alley which was
* severely impacting performance for larger whistles.
*/
if (nextSliceInd < 0 || nextSliceInd >= nSlice-1 || currentSize > whistleControl.getWhistleToneParameters().minPixels) {
return currentSize; return currentSize;
} }
SliceData nextSlice = sliceData.get(nextSliceInd); SliceData nextSlice = sliceData.get(nextSliceInd);