Commit Graph

629 Commits

Author SHA1 Message Date
Jamie Mac
25691563bf Update POM after rebase 2023-12-12 14:17:17 +00:00
Jamie Mac
54264a689b Squashed commit of the following:
commit 840e6c89a1
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Nov 16 20:36:14 2023 +0000

    R2.02.09d

    Fix matched template classifier import
    fix azigram help file image display

commit acc806d375
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Wed Nov 15 13:08:02 2023 +0000

    Updated X3 library to 2.2.6

commit a4f484c76c
Merge: 8e60ad2e d7c4c278
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Wed Nov 15 09:44:09 2023 +0000

    Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into main

commit 8e60ad2eff
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Wed Nov 15 09:43:39 2023 +0000

    update to array diagnostics and sensor control

commit d7c4c278d8
Author: m2oswald <45486636+m2oswald@users.noreply.github.com>
Date:   Wed Nov 15 09:17:49 2023 +0000

    Added code to Rocca for training/testing classifier (#114)

    * allow Rocca to run without classifiers

    Fixed bug that threw an error if no classifier files were specified in Rocca Params dialog

    * add rocca switch to enable dev mode

    currently only shows/hides extra buttons in the Params dialog, but will
    extend to more options in the future

    * Fix memory issue with RoccaContourDataBlocks not being released for
    garbage collection

    Set RoccaContourDataBlock objects to null and stop PamObserver Timer to
    force release

    * Fix problem tracing whistles in Rocca spectrogram pop-up

    Whistle and raw data were being cleared before the user had time to trace out the whistle, causing PAMGuard to throw an exception.  Both were already being cleared when the pop-up window is closed, so no need to do it here.

    * updated for training/testing classifiers

commit d5f504dcd1
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Nov 10 18:08:31 2023 +0000

    Bearing localiser offline save

    Bug stopping it correctly saving data from the offline task to the
    database fixed.

commit 7a44d49e27
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Oct 27 09:59:28 2023 +0100

    X3 Version 2.2.3

    Add maven jar files for X3/SUD version 2.2.3

commit fa5fe9943d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Oct 26 14:44:41 2023 +0100

    update sud file management to more efficiently skip to the correct part
    of a sud file when reading data offline.

commit 60435e567a
Author: Brian S Miller <93690136+BrianSMiller@users.noreply.github.com>
Date:   Fri Sep 8 21:54:40 2023 +1000

    Fixes issues #111 and fixes #112 (DIFAR module crashes and ability to use Deep Learning Detections in DIFAR module) (#110)

    * Bugfix for OverlayMarks

    Check for a null pointer exception in OverlayMarks that was causing a crash on startup.

    * Bugfix for null pointer in symbol manager

    Fix a bug that I found where the DIFAR module was crashing the symbol manager. Seems that this was due to this subclass of clip generator having a null value for it's uniqueName. I've fixed by checking for null values and assigning a generic symbol when null.

    * DeepLearning detections canGenerateClips=true

    Set flag in DeepLearning detector so that detections are considered 'clips' by Pamguard. This allows them to be processed automatically in the DIFAR Localisation module (and maybe others).

    * DIFAR: bugfix frequency limits for auto-detections

    Fix a bug in DIFAR module where the frequency limits of automated detections were not being set properly by the DIFAR module.

    * DeepLearning - Bugfix to detection duration

    Fix bug in deep learning detector where duration (in samples) was being set to number of samples in a hop instead of the number of samples in a segment.
2023-12-12 12:51:13 +00:00
Jamie Mac
a235619edd Updates to FX GUI
Updates to array manager and click detector dialogs for FX GUI
2023-12-12 12:35:36 +00:00
Jamie Mac
6e5f65d35b Updates to FX Gui and Deep Learning Module 2023-11-29 08:14:56 +00:00
Jamie Mac
47662b5045 Squashed commit of the following:
commit d5f504dcd1
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Nov 10 18:08:31 2023 +0000

    Bearing localiser offline save

    Bug stopping it correctly saving data from the offline task to the
    database fixed.

commit 7a44d49e27
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Oct 27 09:59:28 2023 +0100

    X3 Version 2.2.3

    Add maven jar files for X3/SUD version 2.2.3

commit fa5fe9943d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Oct 26 14:44:41 2023 +0100

    update sud file management to more efficiently skip to the correct part
    of a sud file when reading data offline.

commit 60435e567a
Author: Brian S Miller <93690136+BrianSMiller@users.noreply.github.com>
Date:   Fri Sep 8 21:54:40 2023 +1000

    Fixes issues #111 and fixes #112 (DIFAR module crashes and ability to use Deep Learning Detections in DIFAR module) (#110)

    * Bugfix for OverlayMarks

    Check for a null pointer exception in OverlayMarks that was causing a crash on startup.

    * Bugfix for null pointer in symbol manager

    Fix a bug that I found where the DIFAR module was crashing the symbol manager. Seems that this was due to this subclass of clip generator having a null value for it's uniqueName. I've fixed by checking for null values and assigning a generic symbol when null.

    * DeepLearning detections canGenerateClips=true

    Set flag in DeepLearning detector so that detections are considered 'clips' by Pamguard. This allows them to be processed automatically in the DIFAR Localisation module (and maybe others).

    * DIFAR: bugfix frequency limits for auto-detections

    Fix a bug in DIFAR module where the frequency limits of automated detections were not being set properly by the DIFAR module.

    * DeepLearning - Bugfix to detection duration

    Fix bug in deep learning detector where duration (in samples) was being set to number of samples in a hop instead of the number of samples in a segment.
2023-11-15 06:34:55 +00:00
Jamie Mac
81907fedb8 Updates to FX display array dialog 2023-11-15 06:32:44 +00:00
Jamie Mac
137fa0e8ba Fix GPS bug in group localizer offline processing 2023-10-25 09:17:12 +01:00
Jamie Mac
fd3e8cae4b Bug fixes to group localiser.
Makes sure time dependent hydrophones positions are considered when localising
2023-10-23 10:38:06 +01:00
Jamie Mac
330dc91193 Added mimplex localisation 2023-10-11 09:41:35 +01:00
Jamie Mac
e1c70fa02e Adding mimplex to group localiser 2023-10-09 17:02:09 +01:00
Jamie Mac
46e0907cce Merge branch 'main' of https://github.com/macster110/PAMGuard 2023-10-09 14:56:14 +01:00
Jamie Mac
e8fc75dc9e Updates to FX GUI 2023-10-09 14:56:12 +01:00
Jamie Mac
7639eb5f6d Bug fixes to group localiser 2023-09-08 17:32:10 +01:00
Jamie Mac
e1462537f7 Fixes and code rationalisation for group 3D loclaiser 2023-08-25 09:36:26 +01:00
Jamie Mac
c2e3315cf6 Merge remote-tracking branch 'upstream/main' 2023-08-24 13:00:40 +01:00
Jamie Mac
dfd556029a Bug fixes to group localiser 2023-08-24 10:42:11 +01:00
Jamie Mac
1d3d77e5aa Bug fixes to error ellipse and generally getting group loclaiser to work 2023-08-22 16:37:02 +01:00
Jamie Mac
4ee47ee6fe Add MCMC pane and bug fixes to group localiser 2023-08-21 16:58:56 +01:00
Douglas Gillespie
8e8bc56b37 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into main 2023-08-15 20:40:16 +01:00
Douglas Gillespie
97e1241051 1,02.09a: Logger forms bug
Bug in logger forms annotatoins. Crashing when a data field (i.e.
latlong) had > 1 database field.

Also added data selector to Detection grouper list display and fixed
feature in screen position which had a nasty habit of moving the display
to monitor 0 on multiscreen setups.
2023-08-15 20:39:46 +01:00
Jamie Mac
ec48c539ae Updates to FX and group localiser (not building) 2023-08-10 16:49:04 +01:00
Jamie Mac
6474311cb2 Structural changes to group localiser to allow for algorithm specific settings. 2023-08-09 15:17:25 +01:00
Jamie Mac
d5e296b52e Updates to FX GUI 2023-08-09 07:00:13 +01:00
Jamie Mac
2ad06fd0cf Updating the group loclaisation module
Fixed hyperbolic localiser errors.
Added extra MCMCM graphics
Sorting out GUI
2023-08-08 15:53:38 +01:00
Jamie Mac
c3ffb84545 Updates to localiser and sud repo 2023-08-04 16:48:53 +01:00
Jamie Mac
1a6da45413 Adding MCMC based localisation 2023-07-26 12:43:31 +01:00
Jamie Mac
f55a6c030e Updating localisation module. 2023-07-26 12:22:37 +01:00
Jamie Mac
31d0a8dc13 Working on updating localisation module 2023-07-25 16:55:57 +01:00
Jamie Mac
a5db2c62a9 Updates to localisation module and FX stuff 2023-07-06 10:32:34 +01:00
Douglas Gillespie
66cce63837
Stop command (#107)
small change so command is available as a constant
2023-07-03 17:51:02 +01:00
Jamie Mac
94709b6fc8 Updates to group localisation module
Getting infrastructure in place to add options for primary channel and mimplex algorithm.
2023-07-03 17:33:52 +01:00
Douglas Gillespie
c3c31c3312 FindGUI command
Added terminal command to force GUI back onto primary monitor
2023-06-30 16:59:59 +01:00
Douglas Gillespie
42bbf86f5a Screen position
Attempt at fixing screen position so GUI is visible even if screen
arrangement has changed.
2023-06-30 12:16:37 +01:00
Jamie Mac
7adcdf619e Starting work on localiser module 2023-06-30 10:53:08 +01:00
Douglas Gillespie
84f2bd7ad7 V2.02.09
Fix to display time zone problem.
2023-06-29 11:44:00 +01:00
Douglas Gillespie
b7d37e9a81 Calendar sort out
A few problems with local time displays. hopefully now sorted.
2023-06-27 13:43:27 +01:00
Jamie Mac
9c3bbb4ddb New version of X3 for Maven 2023-06-23 10:05:32 +01:00
Jamie Mac
7f0eb31076
Delete C:\Users\postdoc\Desktop\PAMGuard_yearend directory 2023-06-22 16:19:02 +01:00
Jamie Mac
702863fed2 Merge remote-tracking branch 'upstream/main' 2023-06-22 15:47:48 +01:00
Jamie Mac
92990656bc Some FX GUI updates 2023-06-22 15:42:29 +01:00
Douglas Gillespie
b0a063004e Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2023-06-09 12:28:29 +01:00
Douglas Gillespie
8274f00db4 Group3D localiser dialog
Small fix to group3d localiser to correctly enable settings button in
dialog when the dialog is reopened
2023-06-09 12:26:42 +01:00
Douglas Gillespie
d207325b2d Handle corrupt sud files
Better handling of corrupt sud files which will not return a valid audioinputstream. These will be gracelessly skipped during analysis.
2023-05-31 12:41:17 +01:00
Douglas Gillespie
62148351c6 Release V2.02.08 2023-05-30 15:27:29 +01:00
Douglas Gillespie
a8699086ce GPS NMEA Initials
Add a wildcard option so that GPS will use any valid RMC or GGA string
irrespective of the first to characters of the string name.
2023-05-30 14:59:53 +01:00
Douglas Gillespie
d24687dfe9 changes to plugins
small change in function that finds plugins to make it easier to add
temporary ones while developing.
2023-05-26 17:07:18 +01:00
Douglas Gillespie
af5d21df5f updated readme 2023-05-26 10:28:54 +01:00
Douglas Gillespie
d350d5a765 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2023-05-26 09:46:33 +01:00
Douglas Gillespie
397e742358 Update ScrollingDataPanel.java
Fixed 'scroll to' bug in datamap
2023-05-26 09:46:22 +01:00
Douglas Gillespie
d074d40a50 Offline bearing localiser
Fixed some issues with making sure correct raw or fft data are loaded
for offline bearing calculations.
2023-05-25 11:42:05 +01:00