Commit Graph

664 Commits

Author SHA1 Message Date
Jamie Mac
45bf890a62 Implement zip model for deep learning classifier.
Implement zip models which allow packaging of deep learning models with metadata\
Fix TDdsiplayFX spinner bug
Bug fixes for deep learning module after testing
Implement a validator to warn if users have selected all or no classes for binary classifcation.
2024-03-01 15:23:16 +00:00
Jamie Mac
98e7d55034 Bug fixes to CPOD imports and implementing a zip model in PAMGuard. 2024-02-28 17:04:18 +00:00
Jamie Mac
79caa2a388 Bug fixes to CPOD import
Fixed CPOD sample time which caused an import issue when both CP1 and CP3 files were imported
2024-02-26 15:48:52 +00:00
Jamie Mac
e8777ed6db Bug fix to Group localiser in offline mode
The group localiser was not loading hydrophone data
2024-02-26 14:36:38 +00:00
Jamie Mac
ea0be6ae9c Merge branch 'deep_learning' of https://github.com/macster110/PAMGuard into deep_learning 2024-02-26 14:35:24 +00:00
Jamie Mac
1069d1ecc3 Updates to FX GUI 2024-02-23 17:01:52 +00:00
Jamie Mac
08005c06e1 Updates to the decimator FX 2024-02-23 11:59:44 +00:00
Jamie Mac
8b4dbceee8 Some bug fixes 2024-02-23 09:12:10 +00:00
Jamie Mac
f9f29bae75 Updates to CPOD module
Rewrote the importing so it works with CP1 and CP3 files
Fixed several issues in the TD display plotting waveforms
Fixed click train classification flags for CPOD and FPOD data
2024-02-16 16:06:31 +00:00
Jamie Mac
934000fd9c Rewrite import thread code because it's too clunky and slow. 2024-02-15 17:02:18 +00:00
Jamie Mac
66fed778a3 Bug fixes to CPOD stuff 2024-02-15 14:21:44 +00:00
Jamie Mac
6314c90467 Get CPOD click train import working. 2024-02-14 14:27:11 +00:00
Jamie Mac
45b0788c0d Updates to imorting 2024-02-14 06:53:25 +00:00
Jamie Mac
66fb82743b Updates to CPOD module
Display imporevements
2024-02-14 06:24:29 +00:00
Jamie Mac
0f220102c8 Implementing FPOD importing 2024-02-13 11:58:15 +00:00
Jamie Mac
5dc0e35605 Updates to CPOD import and FX
Sorted CSS out so that is accepts multiple stylesheets
Sorted plotting of waveforms from FPOD on dataPlotFX
Sorting out datamap and viewer model for FX GUI
2024-02-09 16:59:30 +00:00
Jamie Mac
f1553215c9 Create decimator.svg 2024-02-09 14:08:29 +00:00
Jamie Mac
c9d9b9fb70 Add FX GUI for decimator module 2024-02-09 14:02:12 +00:00
Jamie Mac
9fb40b055c Merge branch 'deep_learning' of https://github.com/macster110/PAMGuard into deep_learning 2024-02-08 09:30:12 +00:00
Jamie Mac
3e2997dcca Change CSS to use arrays instead of a string
Cahnged the default style so it returns an array of strings. This allows multiple stylesheets to be added per style.
2024-02-08 09:28:49 +00:00
Jamie Mac
68953d12fb Updates to FPOD and PAMGuardFX 2024-02-07 12:39:13 +00:00
Jamie Mac
e25b945d06 Abstracting archive models (Ketos, Koogu and Zip) 2024-02-02 17:00:35 +00:00
Jamie Mac
9957bd3fa3 Implementing FPOD and updates to deep leanring module 2024-02-01 16:14:09 +00:00
Jamie Mac
cf93b11a10 Added ability to download files. 2024-01-22 15:59:57 +00:00
Jamie Mac
a95db3679d Updates to deep learning module for downloading files and to FX GUI 2024-01-19 16:57:17 +00:00
Jamie Mac
37fe953474 Koogu working
Koogu now working...
2024-01-17 07:00:06 +00:00
Jamie Mac
7f1524267e Updates to FX GUI 2024-01-04 21:27:26 +00:00
Jamie Mac
1d8a4ad8b8 Updates to FX GUI
ArrayManager almsot done
2023-12-21 16:47:32 +00:00
Douglas Gillespie
b91105dd07 Settings import (#117)
* Stop command

small change so command is available as a constant

* Lots of small updates to enable opening of a secondary configuration for
batch processing control.

* Fix user input bug in viewer

which created exponential copies of user comments!

* Adding TAST trigger alarm action

To be competed when GW provide correct string for interface

* Echo offline detection

Fix up affected datablocks for offline echo detection

* fix module import

System for importing modules from other psfx files was not working.
Probably wasn't working for quite some time. Now fixed.
2023-12-18 09:39:25 +00:00
Douglas Gillespie
16c69ee212 Merge with main (#116)
* Stop command

small change so command is available as a constant

* Lots of small updates to enable opening of a secondary configuration for
batch processing control.
2023-12-18 09:39:25 +00:00
Douglas Gillespie
f1d6dd0c03 R2.02.09d
Fix matched template classifier import
fix azigram help file image display
2023-12-18 09:39:08 +00:00
Jamie Mac
d0030e868a Squashed commit of the following:
commit f8d2de4482
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Sun Dec 17 12:27:31 2023 +0000

    Settings import (#117)

    * Stop command

    small change so command is available as a constant

    * Lots of small updates to enable opening of a secondary configuration for
    batch processing control.

    * Fix user input bug in viewer

    which created exponential copies of user comments!

    * Adding TAST trigger alarm action

    To be competed when GW provide correct string for interface

    * Echo offline detection

    Fix up affected datablocks for offline echo detection

    * fix module import

    System for importing modules from other psfx files was not working.
    Probably wasn't working for quite some time. Now fixed.

commit b12ccf9c67
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Dec 14 10:50:29 2023 +0000

    Merge with main (#116)

    * Stop command

    small change so command is available as a constant

    * Lots of small updates to enable opening of a secondary configuration for
    batch processing control.

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-18 09:34:30 +00:00
Jamie Mac
223b32014d Updates to Array Pane 2023-12-15 23:18:47 +00:00
Jamie Mac
ef7f8c0b99 Remove print statements 2023-12-14 12:22:22 +00:00
Jamie Mac
60b76fb711 Bug fixes to Match Template classifier
1) When a large template was imported only 1: fftLength of the mathc waveform was used and so clicks would be correlated with noise. The peak of the template is now used when the peak search function is selected.
2) The plus button in the tab pane had disappeared.
3) Seems like the decimators were the wrong round. So the waveforms were using an up sample function when they should have been using a decimator function. and vice versa...major bug when using different sample rates!
2023-12-14 12:06:51 +00:00
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