Commit Graph

1065 Commits

Author SHA1 Message Date
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
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
Douglas Gillespie
bea4a544d0
Merge from DG (#145)
* Localization output

* update localiser output
2024-08-08 14:27:05 +01:00
Douglas Gillespie
adf4c87781
Merge branch 'main' into main 2024-08-08 09:29: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
Douglas Gillespie
36455153a2 Fix doc deletion in detector output panel 2024-07-30 16:34:35 +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
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
Douglas Gillespie
687220dad5 Change click data selector
Change Click BT display so it can handle CompoundDataSelectors
2024-07-22 11:42:19 +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
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
Douglas Gillespie
bad2255710 Better symbol options
Add clearer options button to multi option symbol manager panel.
2024-07-18 09:47:47 +01:00
Douglas Gillespie
a3f41e22e6
Merge pull request #85 from PAMGuard/main
Fix vector error
2024-07-16 10:58:25 +01:00
Douglas Gillespie
f7be084e91 Fix vector error
Fix error in PamVector getMinimalHeadingPitchRoll function which referenced second element even if there was only one element.
2024-07-16 10:57:39 +01:00
Douglas Gillespie
0165982a22 Work on localisation export
Not ready to rock yet.
2024-07-12 16:57:28 +01:00
Douglas Gillespie
f24dd9bb91
Merge pull request #84 from PAMGuard/main
Merge from main
2024-07-12 16:38:11 +01:00
Douglas Gillespie
3f23474ef5 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2024-07-12 16:35:12 +01:00
Douglas Gillespie
e419761f5c Updated POM
Exclude test datasets, trained models, and an unwanted ML library to reduce overall jar size back to something sensible.
2024-07-12 16:34:55 +01:00
Douglas Gillespie
910950878d
Update .classpath (#141)
Fix classpath file
2024-06-25 09:26:44 +01:00
Douglas Gillespie
07f4398a1d
Update .classpath
Fix classpath file
2024-06-25 09:25:10 +01:00
Douglas Gillespie
32ab9f7ead
Merge pull request #83 from PAMGuard/main
V2.02.12
2024-06-24 15:43:47 +01:00
Douglas Gillespie
7accb79f8d V2.02.12
Hopefully final version of V2.02.12
2024-06-24 15:43:00 +01:00
Douglas Gillespie
3a42eabd74
Merge pull request #82 from PAMGuard/main
Merge from main
2024-06-24 13:58:16 +01:00
Douglas Gillespie
f7b4f44e40
Merge branch 'main' into main 2024-06-24 13:57:45 +01:00
Douglas Gillespie
503093cc90 Updated readme 2024-06-24 13:43:02 +01:00
Douglas Gillespie
785423180c Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2024-06-24 13:32:10 +01:00
Douglas Gillespie
2795304f1a
MErge changes from DG dev fork (#140)
* binary store count

Fix issue in binary store object count

* update V10aa/other for testing

* update V10aa/other for testing

* reenable buffer dumping

* update V to 10ac for testing

* Additional diagnostics

Additional output of CPU usage for each module when stopping

* V 2.02.10ad for testing

Fixed issue of finding correct raw data block

* Tidying

Lots of GUI improvement and code tidying. Functionality to export
gzipped documents to reduce traffic.

* V 2.02.10ba for user testing

* Tidy up click selector

Improve layout and tips on dialog and improve logic for manual and
automatic event types.

* Menu tide up

* Update nilus maven for PAMGuard

* Fix reprocess choices

Make sure the choice to continue anyway is always present.

* Improve start of binary file timing

Code to better get binary files to start right on the hour when processing files offline rather than half a sec or so later.

* Fix early data discard

Fix issue in clip generator: when running very fast offline raw data being discarded before clips are generated. Changed threading model slightly and increased data keep time by 2x the thread jitter to try to avoid this.

* Update pom to JSerialCom 2.11.0

* V2.02.11e fix file start skip

Skipping start of files was causing click detector to not find clicks. Changed code so first seconds are still sent, but with data set to 0, rather than not sending data since that was causing sample counts in different bits of PAMGuard to get out of synch.

* Update README.html
2024-06-24 13:31:05 +01:00
Douglas Gillespie
18cb59a209 update DL help 2024-06-24 13:28:02 +01:00
Douglas Gillespie
18a507b5d1 Update README.html 2024-06-20 10:14:37 +01:00
Douglas Gillespie
9d467593de
Big merge from doug (#139)
* binary store count

Fix issue in binary store object count

* update V10aa/other for testing

* update V10aa/other for testing

* reenable buffer dumping

* update V to 10ac for testing

* Additional diagnostics

Additional output of CPU usage for each module when stopping

* V 2.02.10ad for testing

Fixed issue of finding correct raw data block

* Tidying

Lots of GUI improvement and code tidying. Functionality to export
gzipped documents to reduce traffic.

* V 2.02.10ba for user testing

* Tidy up click selector

Improve layout and tips on dialog and improve logic for manual and
automatic event types.

* Menu tide up

* Update nilus maven for PAMGuard

* Fix reprocess choices

Make sure the choice to continue anyway is always present.

* Improve start of binary file timing

Code to better get binary files to start right on the hour when processing files offline rather than half a sec or so later.

* Fix early data discard

Fix issue in clip generator: when running very fast offline raw data being discarded before clips are generated. Changed threading model slightly and increased data keep time by 2x the thread jitter to try to avoid this.

* Update pom to JSerialCom 2.11.0

* V2.02.11e fix file start skip

Skipping start of files was causing click detector to not find clicks. Changed code so first seconds are still sent, but with data set to 0, rather than not sending data since that was causing sample counts in different bits of PAMGuard to get out of synch.
2024-06-20 10:10:06 +01:00
Douglas Gillespie
205848ff38
Merge branch 'Tethys' into main 2024-06-20 10:00:38 +01:00
Douglas Gillespie
f6a1766ca0
Merge pull request #80 from douggillespie/restart
Restart
2024-06-20 09:52:02 +01:00
Douglas Gillespie
69cb9dccb1
Merge pull request #79 from PAMGuard/main
merge from main
2024-06-20 09:48:51 +01:00
Douglas Gillespie
7818049ef1
Restart (#138)
* binary store count

Fix issue in binary store object count

* update V10aa/other for testing

* update V10aa/other for testing

* reenable buffer dumping

* update V to 10ac for testing

* Additional diagnostics

Additional output of CPU usage for each module when stopping

* V 2.02.10ad for testing

Fixed issue of finding correct raw data block
2024-06-20 09:47:53 +01:00
Douglas Gillespie
5cdf408f84
Merge branch 'main' into restart 2024-06-20 09:47:26 +01:00
Douglas Gillespie
1d7a986621 V2.02.11e fix file start skip
Skipping start of files was causing click detector to not find clicks. Changed code so first seconds are still sent, but with data set to 0, rather than not sending data since that was causing sample counts in different bits of PAMGuard to get out of synch.
2024-06-19 15:29:28 +01:00
Douglas Gillespie
a8af4d32f4 Update pom to JSerialCom 2.11.0 2024-06-14 17:53:02 +01:00
Douglas Gillespie
45cc88ac67 Fix early data discard
Fix issue in clip generator: when running very fast offline raw data being discarded before clips are generated. Changed threading model slightly and increased data keep time by 2x the thread jitter to try to avoid this.
2024-06-11 15:55:14 +01:00
Douglas Gillespie
74759cb576 Improve start of binary file timing
Code to better get binary files to start right on the hour when processing files offline rather than half a sec or so later.
2024-06-10 13:03:18 +01:00
Douglas Gillespie
f0aca0c83f Fix reprocess choices
Make sure the choice to continue anyway is always present.
2024-06-10 09:22:30 +01:00
Douglas Gillespie
c607f17449
Merge branch 'main' into main 2024-05-30 11:14:11 +01:00