Commit Graph

1100 Commits

Author SHA1 Message Date
Jamie Mac
61033b38ca Merge branch 'main' of https://github.com/macster110/PAMGuard 2024-05-09 10:21:51 +01:00
Jamie Mac
6f36e5a47f Fix bug in whistle detection plot
Also add ability to change contour colours
2024-05-09 10:21:49 +01:00
Douglas Gillespie
4e0eacde99 right whale symbol selector for fx display
Symbol selector for right whale edge detector on FX display (needs an icon still)
2024-05-07 17:12:02 +01:00
Douglas Gillespie
475e7c42cd DL Params to XML
Write DL parameter to XML output (for Tethys). Needed a bit of messing with .equals in some of the objects in the XML writer class. Not really providing the information we want in the XML, so will need to revisit this in the future.
2024-05-07 17:11:06 +01:00
Jamie Mac
67b6d5e690 DelphinID almost there. 2024-05-07 16:15:29 +01:00
Jamie Mac
c1f4ba9e37 More work on delphinID classifier but not quite there yet. 2024-05-03 16:29:37 +01:00
Jamie Mac
ee694146c3 More updates to get DelphinID working 2024-05-02 16:00:21 +01:00
Douglas Gillespie
7df362ddf2 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2024-05-01 19:21:55 +01:00
Douglas Gillespie
3e71a0f3d9 Map key exception
Fix bug in map key that was getting null pointers.
2024-05-01 19:21:48 +01:00
Jamie Mac
fa6991eb80 Finished testing suite for DelphinID 2024-04-30 17:06:11 +01:00
Douglas Gillespie
e9bf8dd602 Added Tethys output to DL module 2024-04-30 17:01:37 +01:00
Jamie Mac
9ba3e7e3f7 Updates to get DelphinID working including building a testing framework. 2024-04-29 16:58:47 +01:00
Douglas Gillespie
76ee0aebf4 Merge branch 'main' of https://github.com/douggillespie/PAMGuard 2024-04-29 13:04:56 +01:00
Douglas Gillespie
7d2a64a446
Merge pull request #77 from macster110/main
Merge Jamies Deep Learning fork
2024-04-29 13:03:44 +01:00
Douglas Gillespie
c0b014d416
From beta (#137)
* options to modify scroller focus

Needed to stop focus of scroller when other components need to use some
of the key strokes which would normally be consumed by the scroller.

* update lims search in overlay mark.

* update Tethys jars
2024-04-29 11:09:41 +01:00
Jamie Mac
17c428b870 Merge remote-tracking branch 'upstream/main' 2024-04-29 09:26:40 +01:00
Jamie Mac
c6d422d999 Getting DelphinID working and changes to the JavaFX detectin displays 2024-04-26 17:01:34 +01:00
Douglas Gillespie
7b5e7eef17
updated Tethys jars (#136)
* options to modify scroller focus

Needed to stop focus of scroller when other components need to use some
of the key strokes which would normally be consumed by the scroller.

* update lims search in overlay mark.

* update Tethys jars
2024-04-26 15:33:27 +01:00
Douglas Gillespie
12c78536e5 update Tethys jars 2024-04-26 15:29:37 +01:00
Douglas Gillespie
f6d8dada81
From DG (#135)
* options to modify scroller focus

Needed to stop focus of scroller when other components need to use some
of the key strokes which would normally be consumed by the scroller.

* update lims search in overlay mark.
2024-04-26 15:18:12 +01:00
Douglas Gillespie
331f20e925
Merge pull request #76 from PAMGuard/main
Merge from main
2024-04-26 15:16:49 +01:00
Jamie Mac
7ee8562c0c Getting DelphinID working 2024-04-25 17:00:29 +01:00
Douglas Gillespie
6db451699f Fix data load bug 2.02.10bd
Problem in master gps reference hitting  a null, which was in turn stopping data matching for sub detections. Fixed in temp release 2.02.10bd
2024-04-23 17:57:15 +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
85ae261a4c Bug fix fro Group loclaiser
Stopped channel error dialog showing for all algorithms
2024-04-22 10:49:59 +01:00
Douglas Gillespie
8537a2ddec fix continual restart
Stop it not stopping when processing folders of files.
2024-04-21 16:33:56 +01:00
Jamie Mac
6a8593ece8
Update deep_learning_help.md 2024-04-19 16:56:28 +01:00
Jamie Mac
65bbcdeb96 Bug fixes
Fixed wav file export bug from TDDisplayFX
Fixed bug in deep learning classifier where binary classification was not saving properly for generic models.
2024-04-19 10:18:28 +01:00
Jamie Mac
a1adff82cb Updates to exporter and detection display in FX GUI 2024-04-18 12:09:36 +01:00
Douglas Gillespie
209dea47ca Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2024-04-12 18:39:44 +01:00
Douglas Gillespie
52238be194 Fix a couple of null pointers
And pre release 2.02.10bc
2024-04-12 18:39:38 +01:00
Douglas Gillespie
c5065bc3a8 Update nilus maven for PAMGuard 2024-04-02 13:17:29 +01:00
Douglas Gillespie
786bfb1ef5
Merge from dg branch (#134)
* options to modify scroller focus

Needed to stop focus of scroller when other components need to use some
of the key strokes which would normally be consumed by the scroller.

* update lims search in overlay mark.
2024-04-01 17:56:46 +01:00
Douglas Gillespie
a19662caec
Merge pull request #75 from PAMGuard/main
Pull from main
2024-04-01 17:55:46 +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
Douglas Gillespie
21d1c9b488 update lims search in overlay mark. 2024-04-01 15:53:15 +01:00
Douglas Gillespie
232ed44b96 options to modify scroller focus
Needed to stop focus of scroller when other components need to use some
of the key strokes which would normally be consumed by the scroller.
2024-03-31 21:17:17 +01:00
Douglas Gillespie
3e2de8f5dc Small fixes
Deal with null in xml settings output
Deal with -Infinity going into constrainAngle - however many times you add 360 to -Inf, it remains -Inf, so the function was never returning.
2024-03-29 19:40:09 +00:00
Jamie Mac
0eca6a1a9f Updating deep learning module to support delphinID models 2024-03-29 16:41:28 +00:00
Jamie Mac
198071e051 PAMGuard FX gui fix to make sure displays save to the same tab 2024-03-29 15:39:27 +00:00
Douglas Gillespie
8252034f13
Merge updates from Tethys branch (#133)
* 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
2024-03-28 16:43:21 +00:00
Douglas Gillespie
b48c1e7574
Merge branch 'main' into Tethys 2024-03-28 16:41:30 +00:00
Douglas Gillespie
76433fea7a Click offline linking
Corrupted database not linking offline clicks back to binary data so
added some new search features which match on file and click number if
other links on UID fail.
2024-03-28 14:47:56 +00:00
Douglas Gillespie
94adbe77d0 Menu tide up 2024-03-27 16:55:33 +00:00
Douglas Gillespie
3b69341472 Tidy up click selector
Improve layout and tips on dialog and improve logic for manual and
automatic event types.
2024-03-27 11:05:36 +00:00
Jamie Mac
fb9bc63719 Updates to detection group display 2024-03-26 16:23:15 +00:00
Douglas Gillespie
52d8697844 V 2.02.10ba for user testing 2024-03-22 09:42:24 -07:00
Jamie Mac
f42f092f4a Getting detection plots properly working in the FX display. 2024-03-21 16:56:09 +00:00
Douglas Gillespie
ef1a6cf5ee Tidying
Lots of GUI improvement and code tidying. Functionality to export
gzipped documents to reduce traffic.
2024-03-20 16:31:53 -07:00
Jamie Mac
755ff7608d Getting detection displays to work in FX GUI 2024-03-20 13:43:33 +00:00