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

exception handling

Browse Source 
A bit more exception handling in click train detector and output of a version 10aa/other
This commit is contained in:
Douglas Gillespie 2024-03-04 13:05:56 +00:00
parent e3ffd56f69
commit 85b47c86af
6 changed files with 8 additions and 7 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.10a</version> <version>2.02.10aa</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

@ -5,7 +5,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.10a</version> <version>2.02.10aa</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>

2
src/Map/MapRectProjector.java
View File

@ -404,7 +404,7 @@ public class MapRectProjector extends MapProjector {
private String findGpsTrackText(Point mousePoint, int ploNumberMatch) { private String findGpsTrackText(Point mousePoint, int ploNumberMatch) {
GPSControl gpsControl = GPSControl.getGpsControl(); GPSControl gpsControl = GPSControl.getGpsControl();
if (gpsControl == null) { if (gpsControl == null || mousePoint == null) {
return null; return null;
} }
LatLong currentPos = getDataPosition(new Coordinate3d(mousePoint.x, mousePoint.y)); LatLong currentPos = getDataPosition(new Coordinate3d(mousePoint.x, mousePoint.y));

4
src/PamController/PamguardVersionInfo.java
View File

@ -16,7 +16,7 @@ public class PamguardVersionInfo {
* @return release type * @return release type
*/ */
static public ReleaseType getReleaseType() { static public ReleaseType getReleaseType() {
return ReleaseType.CORE; return ReleaseType.OTHER;
} }
/** /**
@ -31,7 +31,7 @@ public class PamguardVersionInfo {
* 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.10a"; static public final String version = "2.02.10aa";
/** /**
* Release date * Release date

3
src/clickTrainDetector/clickTrainAlgorithms/mht/MHTClickTrainAlgorithm.java
View File

@ -45,6 +45,7 @@ public class MHTClickTrainAlgorithm implements ClickTrainAlgorithm, PamSettings
public static final String MHT_NAME = "MHT detector"; public static final String MHT_NAME = "MHT detector";
/** /**
* Reference to the click train control. * Reference to the click train control.
*/ */
@ -382,7 +383,7 @@ public class MHTClickTrainAlgorithm implements ClickTrainAlgorithm, PamSettings
} }
} }
catch (Exception e) { catch (Exception e) {
System.out.printf("******* MHTClickTrainAlgorithm Exception %s in grabDoneTrains: %s\n", e.getClass().getSimpleName(), e.getMessage()); System.out.printf("Handled MHTClickTrainAlgorithm Exception %s in grabDoneTrains: %s\n", e.getClass().getSimpleName(), e.getMessage());
} }
if (nTracks>0) Debug.out.println("-------------------------------------------------"); if (nTracks>0) Debug.out.println("-------------------------------------------------");

2
src/clickTrainDetector/clickTrainAlgorithms/mht/MHTKernel.java
View File

@ -367,7 +367,7 @@ public class MHTKernel<T> {
}); });
} }
catch (Exception e) { catch (Exception e) {
System.out.printf("******* MHTKernel Exception %s in pruneProbMatrix: %s\n", e.getClass().getSimpleName(), e.getMessage()); System.out.printf("Handled MHTKernel Exception %s in pruneProbMatrix: %s\n", e.getClass().getSimpleName(), e.getMessage());
} }
// for (int i=0; i<newPossibleTracks.size(); i++) { // for (int i=0; i<newPossibleTracks.size(); i++) {