From d5f504dcd1a28fcf88d18b7624826e0e1d325ab9 Mon Sep 17 00:00:00 2001 From: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com> Date: Fri, 10 Nov 2023 18:08:31 +0000 Subject: [PATCH] Bearing localiser offline save Bug stopping it correctly saving data from the offline task to the database fixed. --- pom.xml | 2 +- src/PamController/PamguardVersionInfo.java | 4 ++-- src/bearinglocaliser/offline/BLOfflineTask.java | 1 + src/group3dlocaliser/offline/Group3DOfflineTask.java | 4 ++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e76420fa..1494087d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.pamguard Pamguard - 2.02.09b + 2.02.09c Pamguard Java12+ Pamguard for Java 12+, using Maven to control dependcies www.pamguard.org diff --git a/src/PamController/PamguardVersionInfo.java b/src/PamController/PamguardVersionInfo.java index a5d16d78..7172293c 100644 --- a/src/PamController/PamguardVersionInfo.java +++ b/src/PamController/PamguardVersionInfo.java @@ -31,12 +31,12 @@ public class PamguardVersionInfo { * Version number, major version.minorversion.sub-release. * Note: can't go higher than sub-release 'f' */ - static public final String version = "2.02.09b"; + static public final String version = "2.02.09c"; /** * Release date */ - static public final String date = "29 June 2023"; + static public final String date = "10 November 2023"; // /** // * Release type - Beta or Core diff --git a/src/bearinglocaliser/offline/BLOfflineTask.java b/src/bearinglocaliser/offline/BLOfflineTask.java index 3f98c031..3fcde7c1 100644 --- a/src/bearinglocaliser/offline/BLOfflineTask.java +++ b/src/bearinglocaliser/offline/BLOfflineTask.java @@ -22,6 +22,7 @@ public class BLOfflineTask extends OfflineTask { this.bearingLocaliserControl = bearingLocaliserControl; bearingProcess = bearingLocaliserControl.getBearingProcess(); this.addRequiredDataBlock(rawOrFFTBlock = bearingProcess.getParentDataBlock()); + addAffectedDataBlock(detectionBlock); // PamDataBlock detectionSource = bearingLocaliserControl.getDetectionMonitor().getParentDataBlock(); // this.setParentDataBlock(detectionSource); // setParentDataBlock(bearingProcess.getParentDataBlock()); diff --git a/src/group3dlocaliser/offline/Group3DOfflineTask.java b/src/group3dlocaliser/offline/Group3DOfflineTask.java index 0a9a8e94..000f022f 100644 --- a/src/group3dlocaliser/offline/Group3DOfflineTask.java +++ b/src/group3dlocaliser/offline/Group3DOfflineTask.java @@ -26,6 +26,10 @@ public class Group3DOfflineTask extends OfflineTask{ this.group3DControl = group3DControl; group3DProcess = group3DControl.getGroup3dProcess(); addAffectedDataBlock(group3DProcess.getGroup3dDataBlock()); + PamDataBlock parentData = group3DProcess.getParentDataBlock(); + if (parentData != null) { + this.addRequiredDataBlock(parentData); + } } @Override