Commit Graph

82 Commits

Author SHA1 Message Date
Jamie Mac
4f233dd43e Update to the same format as PAMBinaries for exporting to R 2024-08-23 15:04:32 +01:00
Jamie Mac
f5f448cb88 Updates to deep learning and PAMGuardFX GUI 2024-08-08 14:07:16 +01:00
Jamie Mac
1174e371f0 Detection plot bug fix when showing no scroll bar 2024-07-31 20:58:44 +01:00
Jamie Mac
53d6b7bd88 Work on the data selector for the deep learning module. 2024-07-15 15:25:16 +01:00
Jamie Mac
3f06d8faf0 Updates to DL data selector and POM 2024-07-14 22:15:55 +01:00
Jamie Mac
f9e87e92ab Updated POm to ignore test resources and updates to DL data selector 2024-07-12 08:33:03 +01:00
Douglas Gillespie
a6b0ccd780 V2.02.11d
Some small updates to DL module for DCL training workshop
2024-05-30 11:06:44 +01:00
Jamie Mac
bf20889743 Updates to exporter
Getting export capability working in PAMGuard
Updated POM to use more up to date repository
2024-05-24 11:30:01 +01:00
Jamie Mac
2c8d54b660 Update pom to more recent SQLite driver version 2024-05-13 16:52:28 +01:00
Jamie Mac
822832f179 Updates to DelphinID 2024-05-10 08:50:12 +01:00
Jamie Mac
c6d422d999 Getting DelphinID working and changes to the JavaFX detectin displays 2024-04-26 17:01:34 +01:00
Jamie Mac
9b77a97a17 Updates to deep learning module structure get delphinID working
Also sorted out some build issues with Tethys in the POM
2024-04-22 16:59:34 +01:00
Jamie Mac
ca2fef11e5 Bug fixes and updates to deep learning models
Defualt model for Atlantic humpback whale implemented
Koogu and zip model unit tests
2024-04-01 16:56:35 +01:00
Jamie Mac
1387428a32 Starting exporter and added new units tests for deep learning module. 2024-03-15 16:55:46 +00:00
Jamie Mac
aa6d289984 Add unit tests to deep learning and remove unwanted X3 libraries 2024-03-12 16:57:00 +00:00
Jamie Mac
da295502eb Creating export manager 2024-03-05 17:10:33 +00:00
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
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
1069d1ecc3 Updates to FX GUI 2024-02-23 17:01:52 +00:00
Jamie Mac
6314c90467 Get CPOD click train import working. 2024-02-14 14:27:11 +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
68953d12fb Updates to FPOD and PAMGuardFX 2024-02-07 12:39:13 +00:00
Jamie Mac
9957bd3fa3 Implementing FPOD and updates to deep leanring module 2024-02-01 16:14:09 +00:00
Jamie Mac
37fe953474 Koogu working
Koogu now working...
2024-01-17 07:00:06 +00:00
Jamie Mac
1d8a4ad8b8 Updates to FX GUI
ArrayManager almsot done
2023-12-21 16:47:32 +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
6e5f65d35b Updates to FX Gui and Deep Learning Module 2023-11-29 08:14:56 +00: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
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
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
Douglas Gillespie
84f2bd7ad7 V2.02.09
Fix to display time zone problem.
2023-06-29 11:44:00 +01:00
Douglas Gillespie
c17208d315 Map file errors
Trap errors in corrupt map files and deal with a null array error in
analogue sensors readout.
2023-05-23 15:45:44 +01:00
Douglas Gillespie
a7cacc108f update to X3 repo 2023-05-04 13:39:50 +01:00
Douglas Gillespie
56cb06ea1c
Batch and X3 updates (#105)
* Update FileListWorker.java

* Support batch processing

Multicast controller and a couple of additional commands to work with
the batch processing plugin.

* Database float unpack

Better unpacking checks of floats coming back from the database

* Batch changes

Changes in support of batch processing

* Small changes for batch processing

* update X3 to get Detector parameters

X3 and PAMguard updated to get and save the SoundTrap click detector
parameters.
2023-05-03 19:10:07 +01:00
Douglas Gillespie
317f87265a Updated x3
updated SUD reader to handle and unexpectedchunkID.
2023-04-24 12:49:19 +01:00
Douglas Gillespie
74066712b8 Fix Data export bug
Bug causing npe when exporting data to database. Fixed problem.

And better error messages in some thrown exceptions to make it easier to
identify where errors are occurring.
2023-04-04 18:04:13 +01:00
Douglas Gillespie
269398890e 2.02.07b
Fix ICI display bug in click detector
2023-01-19 17:53:59 +00:00
Douglas Gillespie
a89279ef81 V2.02.07a dB levels bug fix
Fixed bug in some level calculations where a channel map instead of a
single channel was being passed to the function performing the calcs.
Was OK if hydrophones had same gain, but got it wrong if they were
different.
2023-01-18 11:06:03 +00:00
Douglas Gillespie
e169ccb1a7 Version 2.02.07
Final readme, POM and version numbering for release 2.02.07
2023-01-10 11:17:44 +00:00
Douglas Gillespie
4322b2d42b Hide tooltips
Added option to help menu to hide all tooltips in the GUI.
2022-12-19 13:55:27 +00:00
Douglas Gillespie
6995bee65b Logger LatLong
Fix a couple of issues which threw and error in the event of a bad NMEA
string.
2022-11-27 14:44:19 +00:00
Douglas Gillespie
3203a0a50f Remove a few terminal outputs
Mostly with file analysis, to reduce junk on terminal
2022-11-18 10:52:50 +00:00
Douglas Gillespie
7d7ecb9545
Version 2.02.06 (#86)
(hopefully)
2022-11-15 17:39:37 +00:00
Douglas Gillespie
ea32c5cdcb
SUD Files (#83)
* Adding comments to table definitions.

Update tabledefs so tableitems can have descriptions. Useful to the
coder, but can also export formal xms schema for each table.

* Writing xml schema

Writing xml schema for PAMGuard database with annotations as complex
types

* Working SUD click extractor

Seems to be mostly working and can generate PAMGuard click files
automatically when processing SUD files using the soundtrap click
detector

* Small changes to SUD in PAMGuard

* Better SUD timing

Using latest microsecond time extraction from SUD unpack

* SUD Processing

Extraction of SUD file clicks with SoundTrap Click Detector. Timing now
correct. Added some help pages.

* Functional SUD Reader and SUD Click Extractor

All seems working. Seems to throw the odd exception at end of file, but
works OK.
2022-11-13 17:41:13 +00:00