Commit Graph

1077 Commits

Author SHA1 Message Date
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
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
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
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
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
Jamie Mac
6ba9efbbae Update deep_learning_help.md 2024-07-18 10:00:23 +01:00
Jamie Mac
e7251edd25 Updates to deep learning symbol options for swing and data selector panel for swing
Made tooltips last longer on TD display  FX
2024-07-18 10:00:23 +01:00
Jamie Mac
d0057e475b Update deep_learning_help.md
Updated help values to have some info on data selectors and symbol managers.
2024-07-18 10:00:23 +01:00
Jamie Mac
de97261e96 Data selectors for deep learning models now working with FX
Still have to be implemented in Swing
2024-07-18 10:00:23 +01:00
Jamie Mac
edd9df426f Work on the data selector for the deep learning module. 2024-07-18 10:00:23 +01:00
Jamie Mac
d2ba95f500 Updates to DL data selector and POM 2024-07-18 10:00:23 +01:00
Jamie Mac
29ecb628d3 Bug fix to data transforms if the wave data and sample length are different 2024-07-18 10:00:23 +01:00
Jamie Mac
0f9722acc5 Updated POm to ignore test resources and updates to DL data selector 2024-07-18 10:00:23 +01:00
Jamie Mac
5c6406efa5 Implementing a data selector for the deep learning module 2024-07-18 10:00:15 +01:00
Jamie Mac
eb5ffa7b00 Updates to sud zero pad options on FX GUI 2024-07-18 10:00:15 +01:00
Jamie Mac
5f8a6e667f Add zero pad option for sud files. 2024-07-18 10:00:15 +01:00
Jamie Mac
9fc061d55d Working on new symbol options for deep learning and sud file options in SoundAcquisition GUI 2024-07-18 10:00:15 +01:00
Jamie Mac
aa11293162 Working out on exporter 2024-07-18 10:00:15 +01:00
Jamie Mac
53d78a638a Working on the exporter 2024-07-18 10:00:15 +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
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
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
Jamie Mac
f4fa3323b7 Merge branch 'main' of https://github.com/macster110/PAMGuard 2024-07-12 08:33:08 +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
Jamie Mac
1939358639 Bug fix to data transforms if the wave data and sample length are different 2024-07-11 11:27:25 +01:00
Jamie Mac
15d72c8fd5 Implementing a data selector for the deep learning module 2024-07-10 21:40:53 +01:00
Jamie Mac
38dc7e6076 Updates to sud zero pad options on FX GUI 2024-07-09 16:36:04 +01:00
Jamie Mac
6ee03579d0 Add zero pad option for sud files. 2024-07-09 13:14:43 +01:00
Jamie Mac
9628b69f3b Working on new symbol options for deep learning and sud file options in SoundAcquisition GUI 2024-07-08 16:26:51 +01:00
Douglas Gillespie
910950878d
Update .classpath (#141)
Fix classpath file
2024-06-25 09:26:44 +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
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