Commit Graph

1183 Commits

Author SHA1 Message Date
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
Jamie Mac
a0399fce84 Working out on exporter 2024-06-13 16:55:47 +01:00
Jamie Mac
c1bb771cff Working on the exporter 2024-06-13 08:56:25 +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
Douglas Gillespie
a6b0ccd780 V2.02.11d
Some small updates to DL module for DCL training workshop
2024-05-30 11:06:44 +01:00
Douglas Gillespie
97d26f8524
Merge pull request #78 from macster110/main
Merge from Jamie
2024-05-29 09:33:35 +01:00
Jamie Mac
c89f05565b update to high res icons 2024-05-29 08:44:40 +01:00
Jamie Mac
d294d3260a Bug for MATLAB r export when angles are null 2024-05-29 08:04:47 +01:00
Jamie Mac
a8f01b1509 Add scaling icons to PAMGuard swing 2024-05-29 07:17:13 +01:00
Jamie Mac
9e13e9a8d5 Minor bug fixes and tidying up for exporters 2024-05-28 16:53:20 +01:00
Jamie Mac
4707830953 Updates to exporter 2024-05-27 16:55:53 +01:00
Jamie Mac
d8cd536f26 Updates to detection display in FX GUI 2024-05-24 16:56:37 +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
Douglas Gillespie
63b2572b8b fix metadata diaog
And also change class loader for plugins to not initialise classes since it causes an error if a plugin is depenent on a class in a plugin not yet loaded
2024-05-22 19:08:58 +01:00
Jamie Mac
7df04d58a2 DelphinID training script 2024-05-17 16:34:45 +01:00
Jamie Mac
f9b13da1d1
Merge pull request #2 from douggillespie/main
Add Tethys output to DL module
2024-05-16 09:19:41 +01:00
Jamie Mac
83678d3c25 Updates to delphinID and TDisplayFX 2024-05-16 08:29:17 +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
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