Commit Graph

1177 Commits

Author SHA1 Message Date
Jamie Mac
2c11ff435b Updates to exporter and data map in FX GUI 2024-08-21 12:53:53 +01:00
Jamie Mac
791dad9439 Merge branch 'main' of https://github.com/macster110/PAMGuard 2024-08-19 16:29:25 +01:00
Jamie Mac
9d4642b6a6 Work on PAMGuard exporter 2024-08-19 16:29:20 +01:00
Douglas Gillespie
cb1b28423e updates ready for 2.2.12 2024-08-19 15:55:25 +01:00
Douglas Gillespie
4829b46b36
Merge from DG (#149)
* Localization output

* update localiser output

* Start effort management system

* Start of Effort plotting

Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).

* Logger forms update

Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.

* Update LoggerFormGraphics.java

add in correct symbol managemet to forms graphics.

* Effort lines on map

Sort of working OK in real time mode.

* Working effort system

Currently only for map, but seems to work OK

* Update Tethys to latest nilus schema

* Raven importer

Start of a system for a raven importer. Not quite working yet.

* Raven import

Basic functionality working. Not nice to use though.

* Tethys Localization work

Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.

* updated Nilus

A few updates around track and target motion measures.

* FX Plot for raven data

Also sorted out symbols a bit and improved symbol selector in Generic plots.

* Update spectrogram mark bearing display

Remove the 90-angle bit
2024-08-19 11:54:24 +01:00
Douglas Gillespie
507ff9e28d
Merge from DG (#148)
* Localization output

* update localiser output

* Start effort management system

* Start of Effort plotting

Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).

* Logger forms update

Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.

* Update LoggerFormGraphics.java

add in correct symbol managemet to forms graphics.

* Effort lines on map

Sort of working OK in real time mode.

* Working effort system

Currently only for map, but seems to work OK

* Update Tethys to latest nilus schema

* Raven importer

Start of a system for a raven importer. Not quite working yet.

* Raven import

Basic functionality working. Not nice to use though.

* Tethys Localization work

Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.

* updated Nilus

A few updates around track and target motion measures.

* FX Plot for raven data

Also sorted out symbols a bit and improved symbol selector in Generic plots.
2024-08-17 14:34:54 +01:00
Jamie Mac
38fde8bc3a Merge branch 'main' of https://github.com/macster110/PAMGuard 2024-08-16 16:58:32 +01:00
Jamie Mac
d4a6531fec Added peak transform pane to deep learning classifier. 2024-08-16 16:58:29 +01:00
Douglas Gillespie
51757499d4
Merge from DG (#147)
* Localization output

* update localiser output

* Start effort management system

* Start of Effort plotting

Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).

* Logger forms update

Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.

* Update LoggerFormGraphics.java

add in correct symbol managemet to forms graphics.

* Effort lines on map

Sort of working OK in real time mode.

* Working effort system

Currently only for map, but seems to work OK

* Update Tethys to latest nilus schema

* Raven importer

Start of a system for a raven importer. Not quite working yet.

* Raven import

Basic functionality working. Not nice to use though.

* Tethys Localization work

Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.

* updated Nilus

A few updates around track and target motion measures.
2024-08-16 10:44:54 +01:00
Douglas Gillespie
46bd88c197
Merge Tethys updates from DG (#146)
* Localization output

* update localiser output

* Start effort management system

* Start of Effort plotting

Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).

* Logger forms update

Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.

* Update LoggerFormGraphics.java

add in correct symbol managemet to forms graphics.

* Effort lines on map

Sort of working OK in real time mode.

* Working effort system

Currently only for map, but seems to work OK

* Update Tethys to latest nilus schema

* Raven importer

Start of a system for a raven importer. Not quite working yet.

* Raven import

Basic functionality working. Not nice to use though.

* Tethys Localization work

Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.

* updated Nilus

A few updates around track and target motion measures.
2024-08-16 10:40:00 +01:00
Jamie Mac
984a37235e Updates to the PAMGuardFX launcher 2024-08-12 17:01:36 +01:00
Douglas Gillespie
bea4a544d0
Merge from DG (#145)
* Localization output

* update localiser output
2024-08-08 14:27:05 +01:00
Jamie Mac
f5f448cb88 Updates to deep learning and PAMGuardFX GUI 2024-08-08 14:07:16 +01:00
Douglas Gillespie
adf4c87781
Merge branch 'main' into main 2024-08-08 09:29:24 +01:00
Jamie Mac
fc4c9495cf Getting click deep learning model 2024-08-07 06:11:24 +01:00
Douglas Gillespie
2929372533 Tethys Localisation output
Not all types, but getting there.
2024-08-05 17:58:08 +01:00
Douglas Gillespie
62121bdbbd update jserialcom to 2.11.0 2024-08-04 11:41:08 +01:00
Douglas Gillespie
82adc06e3d
Merge DG branch (#144)
* Refactoring Tethys

A lot of refactoring of Nilus wrappers with more useful Objects for PAMGUard to work with.

* Improved document handling

Abstracted wrapper around nilus documents which allows easyish calling of internal functions in Localize and Detections document without a common base class.

* Fix doc deletion in detector output panel
2024-08-02 15:26:49 +01:00
Jamie Mac
1174e371f0 Detection plot bug fix when showing no scroll bar 2024-07-31 20:58:44 +01:00
Jamie Mac
9fcc6792f9 Updates to data map and fix to detection plots. 2024-07-30 16:46:50 +01:00
Douglas Gillespie
36455153a2 Fix doc deletion in detector output panel 2024-07-30 16:34:35 +01:00
Jamie Mac
7e4ee768d2 Updates to the data map for JavaFX 2024-07-29 16:04:46 +01:00
Jamie Mac
9e65fb18f4 Fix for colour limits on DL prediction pane 2024-07-26 16:40:18 +01:00
Jamie Mac
7be2e4eeed Working on datamap for FX mode 2024-07-26 16:39:41 +01:00
Douglas Gillespie
bc686c0fe6 Improved document handling
Abstracted wrapper around nilus documents which allows easyish calling of internal functions in Localize and Detections document without a common base class.
2024-07-26 16:12:54 +01:00
Jamie Mac
3d7058e671 Updates to deep learning module to handle individual clicks 2024-07-26 09:05:43 +01:00
Jamie Mac
9931e16350 Merge branch 'main' of https://github.com/macster110/PAMGuard 2024-07-24 06:02:02 +01:00
Jamie Mac
f4a8f6c0b9 Merge branch 'main' of https://github.com/macster110/PAMGuard 2024-07-23 17:26:21 +01:00
Jamie Mac
3e59a11925 Bug fixes to DL Symbol Pane 2024-07-23 17:26:12 +01:00
Jamie Mac
1fc349974a Bug fixes to deep learning module and TDisplayFX 2024-07-23 17:24:46 +01:00
Douglas Gillespie
4f87b7b661 Refactoring Tethys
A lot of refactoring of Nilus wrappers with more useful Objects for PAMGUard to work with.
2024-07-22 16:07:33 +01:00
Douglas Gillespie
3abaff0379
Merge pull request #86 from PAMGuard/main
Merge from main
2024-07-22 13:50:49 +01:00
Douglas Gillespie
9eee7434de
Merge branch 'main' into main 2024-07-22 13:50:38 +01:00
Douglas Gillespie
32c7c9b263
Merge from Jamie (#143)
* Working on the exporter

* Working out on exporter

* Working on new symbol options for deep learning and sud file options in SoundAcquisition GUI

* Add zero pad option for sud files.

* Updates to sud zero pad options on FX GUI

* Implementing a data selector for the deep learning module

* Bug fix to data transforms if the wave data and sample length are different

* Updated POm to ignore test resources and updates to DL data selector

* Updates to DL data selector and POM

* Work on the data selector for the deep learning module.

* Working on the exporter

* Working out on exporter

* Working on new symbol options for deep learning and sud file options in SoundAcquisition GUI

* Add zero pad option for sud files.

* Updates to sud zero pad options on FX GUI

* Implementing a data selector for the deep learning module

* Updated POm to ignore test resources and updates to DL data selector

* Bug fix to data transforms if the wave data and sample length are different

* Updates to DL data selector and POM

* Work on the data selector for the deep learning module.

* Data selectors for deep learning models now working with FX

Still have to be implemented in Swing

* Update deep_learning_help.md

Updated help values to have some info on data selectors and symbol managers.

* Updates to deep learning symbol options for swing and data selector panel for swing

Made tooltips last longer on TD display  FX

* Update deep_learning_help.md

* Swing symbol modifiers for DL and peak freq

* Squashed commit of the following:

commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Jul 18 09:47:47 2024 +0100

    Better symbol options

    Add clearer options button to multi option symbol manager panel.

* Fix bugs in detection display

* Bug fix to hiding panes

* Squashed commit of the following:

commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 19 17:14:28 2024 +0100

    Updated data selectors for BT display

    Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Jul 18 09:47:47 2024 +0100

    Better symbol options

    Add clearer options button to multi option symbol manager panel.

* Deep learning bug fix

* Ignore the class path

* Squashed commit of the following:

commit 577670ccd0
Merge: 6510d226 8b5b5b2f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:35:01 2024 +0100

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

commit 6510d2260e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:34:58 2024 +0100

    Remove unnecessary text output

commit 3da8401756
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:29:38 2024 +0100

    updates to Daq

    New DLL, and some LED control, but hasn't fixed stalling problem.

commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 19 17:14:28 2024 +0100

    Updated data selectors for BT display

    Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Jul 18 09:47:47 2024 +0100

    Better symbol options

    Add clearer options button to multi option symbol manager panel.

* Squashed commit of the following:

commit 687220dad5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 11:42:19 2024 +0100

    Change click data selector

    Change Click BT display so it can handle CompoundDataSelectors

commit 577670ccd0
Merge: 6510d226 8b5b5b2f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:35:01 2024 +0100

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

commit 6510d2260e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:34:58 2024 +0100

    Remove unnecessary text output

commit 3da8401756
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:29:38 2024 +0100

    updates to Daq

    New DLL, and some LED control, but hasn't fixed stalling problem.

commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 19 17:14:28 2024 +0100

    Updated data selectors for BT display

    Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Jul 18 09:47:47 2024 +0100

    Better symbol options

    Add clearer options button to multi option symbol manager panel.

---------

Co-authored-by: Jamie Mac <macster110@gmail.com>
2024-07-22 11:55:06 +01:00
Jamie Mac
120b1eb56f Squashed commit of the following:
commit 687220dad5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 11:42:19 2024 +0100

    Change click data selector

    Change Click BT display so it can handle CompoundDataSelectors

commit 577670ccd0
Merge: 6510d226 8b5b5b2f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:35:01 2024 +0100

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

commit 6510d2260e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:34:58 2024 +0100

    Remove unnecessary text output

commit 3da8401756
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:29:38 2024 +0100

    updates to Daq

    New DLL, and some LED control, but hasn't fixed stalling problem.

commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 19 17:14:28 2024 +0100

    Updated data selectors for BT display

    Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Jul 18 09:47:47 2024 +0100

    Better symbol options

    Add clearer options button to multi option symbol manager panel.
2024-07-22 11:53:11 +01:00
Jamie Mac
a993b27155 Squashed commit of the following:
commit 577670ccd0
Merge: 6510d226 8b5b5b2f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:35:01 2024 +0100

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

commit 6510d2260e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:34:58 2024 +0100

    Remove unnecessary text output

commit 3da8401756
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:29:38 2024 +0100

    updates to Daq

    New DLL, and some LED control, but hasn't fixed stalling problem.

commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 19 17:14:28 2024 +0100

    Updated data selectors for BT display

    Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Jul 18 09:47:47 2024 +0100

    Better symbol options

    Add clearer options button to multi option symbol manager panel.
2024-07-22 11:50:50 +01:00
Jamie Mac
747a2b2284 Merge branch 'main' of https://github.com/macster110/PAMGuard 2024-07-22 11:50:35 +01:00
Jamie Mac
79e85ec427 Ignore the class path 2024-07-22 11:50:33 +01:00
Douglas Gillespie
687220dad5 Change click data selector
Change Click BT display so it can handle CompoundDataSelectors
2024-07-22 11:42:19 +01:00
Jamie Mac
38cd627fef Merge branch 'main' of https://github.com/macster110/PAMGuard 2024-07-22 09:51:20 +01:00
Jamie Mac
22a0e5004d Deep learning bug fix 2024-07-22 09:49:57 +01:00
Douglas Gillespie
577670ccd0 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2024-07-22 09:35:01 +01:00
Douglas Gillespie
6510d2260e Remove unnecessary text output 2024-07-22 09:34:58 +01:00
Douglas Gillespie
3da8401756 updates to Daq
New DLL, and some LED control, but hasn't fixed stalling problem.
2024-07-22 09:29:38 +01:00
Jamie Mac
cb3f4ca041 Squashed commit of the following:
commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 19 17:14:28 2024 +0100

    Updated data selectors for BT display

    Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Jul 18 09:47:47 2024 +0100

    Better symbol options

    Add clearer options button to multi option symbol manager panel.
2024-07-22 09:11:00 +01:00
Douglas Gillespie
8b5b5b2f18 Updated data selectors for BT display
Merging old status bar and new DataSelector options so that they work more consistently on the BT display.
2024-07-19 17:14:28 +01:00
Jamie Mac
6d58cee3b3 Bug fix to hiding panes 2024-07-19 16:49:34 +01:00
Jamie Mac
c01e966eaf Fix bugs in detection display 2024-07-18 16:37:15 +01:00
Jamie Mac
aa686cac5e Squashed commit of the following:
commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Jul 18 09:47:47 2024 +0100

    Better symbol options

    Add clearer options button to multi option symbol manager panel.
2024-07-18 10:36:26 +01:00
Jamie Mac
12bf8cb5f7 Swing symbol modifiers for DL and peak freq 2024-07-18 10:00:23 +01:00