Commit Graph

304 Commits

Author SHA1 Message Date
Jamie Mac
252cb30d67 Bug fix for click train logging
The size of the string classifers field was dynamically set - this was a bug.
2022-08-17 09:07:01 +01:00
Douglas Gillespie
16a3210424
Merge branch 'main' into main 2022-08-08 10:31:26 +01:00
Jamie Mac
3c72fb78d9 Bug fixes to click train detector
Fixed bug with number of coasts in the MHT Kernel
Added an option for amplitude to have a maximum
Removed print statements.
2022-08-06 11:47:38 +01:00
Douglas Gillespie
b4bdae94ca Scroll to ...
Found a radom extra 5s taken off the scroll time. Remove it !
2022-08-05 09:47:39 +01:00
Jamie Mac
36fb1e0e3d Squashed commit of the following:
commit 11ba8bf91e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Aug 4 11:45:47 2022 +0100

    MErge from DG Branch (#47)

    * Variable sound output level

    Mods to SoundPlayback module to allow additional parameters. Implemented
    system for NI cards to allow changes to selected output voltage range
    meaning output can be boosted to level higher than current default.

    * Code to support nogui operations when no screens present on headless
    system

    * Fix problem of nogui headless operation trying to access screen size.

    * Click detector display fixes

    1. ICI not displaying correctly
    2. Component sizes in display dialog on hres monitors

    * Work on batch processing, after testing of options to autostart,
    autoexit and set wav file folder, database and binary store.

    * Update MHTClickTrainAlgorithm.java

    Fix unsynchronised access to a datablock in click train detector which was causing index errors.

    * Revamp of offline process messaging and control

    Includes some databsae logging of completed tasks

    * Offline task logging

    Bit more work, including notes and database storage of task
    reprocessing. Guess this could all become 'proper' PAMGuard data and be
    shown in a table on the display but that not priority enough.

    * Dialog packing

    Fix a couple of dialogs which don't back well on HDPI monitors

    * UDP Control

    Added multiport functionality

commit 9a9f542d95
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Aug 4 11:42:45 2022 +0100

    Merge DG to Main (#46)

    * Variable sound output level

    Mods to SoundPlayback module to allow additional parameters. Implemented
    system for NI cards to allow changes to selected output voltage range
    meaning output can be boosted to level higher than current default.

    * Code to support nogui operations when no screens present on headless
    system

    * Fix problem of nogui headless operation trying to access screen size.

    * Click detector display fixes

    1. ICI not displaying correctly
    2. Component sizes in display dialog on hres monitors

    * Work on batch processing, after testing of options to autostart,
    autoexit and set wav file folder, database and binary store.

    * Update MHTClickTrainAlgorithm.java

    Fix unsynchronised access to a datablock in click train detector which was causing index errors.

    * Revamp of offline process messaging and control

    Includes some databsae logging of completed tasks

    * Offline task logging

    Bit more work, including notes and database storage of task
    reprocessing. Guess this could all become 'proper' PAMGuard data and be
    shown in a table on the display but that not priority enough.

    * Dialog packing

    Fix a couple of dialogs which don't back well on HDPI monitors

    * UDP Control

    Added multiport functionality

commit 49cd547aee
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Aug 4 11:40:29 2022 +0100

    Merge DG branch (#45)

    * Variable sound output level

    Mods to SoundPlayback module to allow additional parameters. Implemented
    system for NI cards to allow changes to selected output voltage range
    meaning output can be boosted to level higher than current default.

    * Code to support nogui operations when no screens present on headless
    system

    * Fix problem of nogui headless operation trying to access screen size.

    * Click detector display fixes

    1. ICI not displaying correctly
    2. Component sizes in display dialog on hres monitors

    * Work on batch processing, after testing of options to autostart,
    autoexit and set wav file folder, database and binary store.

    * Update MHTClickTrainAlgorithm.java

    Fix unsynchronised access to a datablock in click train detector which was causing index errors.

    * Revamp of offline process messaging and control

    Includes some databsae logging of completed tasks

    * Offline task logging

    Bit more work, including notes and database storage of task
    reprocessing. Guess this could all become 'proper' PAMGuard data and be
    shown in a table on the display but that not priority enough.

    * Dialog packing

    Fix a couple of dialogs which don't back well on HDPI monitors

    * UDP Control

    Added multiport functionality

commit 016cfd0da5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Aug 4 11:35:06 2022 +0100

    Dialog positioning

    New functions to better positions dialogs on screen

commit c9f2ab3e97
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Aug 1 11:13:24 2022 +0100

    puch to main (#44)

    * Variable sound output level

    Mods to SoundPlayback module to allow additional parameters. Implemented
    system for NI cards to allow changes to selected output voltage range
    meaning output can be boosted to level higher than current default.

    * Code to support nogui operations when no screens present on headless
    system

    * Fix problem of nogui headless operation trying to access screen size.

    * Click detector display fixes

    1. ICI not displaying correctly
    2. Component sizes in display dialog on hres monitors

    * Work on batch processing, after testing of options to autostart,
    autoexit and set wav file folder, database and binary store.

    * Update MHTClickTrainAlgorithm.java

    Fix unsynchronised access to a datablock in click train detector which was causing index errors.

    * Revamp of offline process messaging and control

    Includes some databsae logging of completed tasks

    * Offline task logging

    Bit more work, including notes and database storage of task
    reprocessing. Guess this could all become 'proper' PAMGuard data and be
    shown in a table on the display but that not priority enough.

    * Dialog packing

    Fix a couple of dialogs which don't back well on HDPI monitors

commit 55f5a3fcf1
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Aug 1 10:59:36 2022 +0100

    Group detections menu

    Small changes to limit the number of menu items in "Add to existing
    group" to a maximum of 25 entries.

commit b3f6c0e665
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 29 10:50:45 2022 +0100

    Handle -nogui option in PamWorker

    PamWorker used to catalog files at startup (if a file folder input
    system is used). This creates a progress dialog. Stop it appearing in
    -nogui operations.

commit 8569b6b579
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 22 08:30:47 2022 +0100

    Click display fixes (#41)

    * Variable sound output level

    Mods to SoundPlayback module to allow additional parameters. Implemented
    system for NI cards to allow changes to selected output voltage range
    meaning output can be boosted to level higher than current default.

    * Code to support nogui operations when no screens present on headless
    system

    * Fix problem of nogui headless operation trying to access screen size.

    * Click detector display fixes

    1. ICI not displaying correctly
    2. Component sizes in display dialog on hres monitors

commit 128a512ff6
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Tue Jul 19 16:37:57 2022 +0100

    Another attempt at stopping it crashing on a headless system

    Dealing with displays that get created for clickangle vetos and a call
    to the gui in the click train detector.

commit 6eaa6e4978
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Tue Jul 19 08:20:07 2022 +0100

    nogoi fix for headless systems. (#40)

    * Variable sound output level

    Mods to SoundPlayback module to allow additional parameters. Implemented
    system for NI cards to allow changes to selected output voltage range
    meaning output can be boosted to level higher than current default.

    * Code to support nogui operations when no screens present on headless
    system

    * Fix problem of nogui headless operation trying to access screen size.

commit 9fdd30556b
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Tue Jul 12 15:53:07 2022 +0100

    Variable sound output level (#39)

    Mods to SoundPlayback module to allow additional parameters. Implemented
    system for NI cards to allow changes to selected output voltage range
    meaning output can be boosted to level higher than current default.
2022-08-04 14:07:49 +01:00
Jamie Mac
601d7b9385 Fixes to FX UI 2022-08-04 14:02:39 +01:00
Douglas Gillespie
11ba8bf91e
MErge from DG Branch (#47)
* Variable sound output level

Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.

* Code to support nogui operations when no screens present on headless
system

* Fix problem of nogui headless operation trying to access screen size.

* Click detector display fixes

1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors

* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.

* Update MHTClickTrainAlgorithm.java

Fix unsynchronised access to a datablock in click train detector which was causing index errors.

* Revamp of offline process messaging and control

Includes some databsae logging of completed tasks

* Offline task logging

Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.

* Dialog packing

Fix a couple of dialogs which don't back well on HDPI monitors

* UDP Control

Added multiport functionality
2022-08-04 11:45:47 +01:00
Douglas Gillespie
9a9f542d95
Merge DG to Main (#46)
* Variable sound output level

Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.

* Code to support nogui operations when no screens present on headless
system

* Fix problem of nogui headless operation trying to access screen size.

* Click detector display fixes

1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors

* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.

* Update MHTClickTrainAlgorithm.java

Fix unsynchronised access to a datablock in click train detector which was causing index errors.

* Revamp of offline process messaging and control

Includes some databsae logging of completed tasks

* Offline task logging

Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.

* Dialog packing

Fix a couple of dialogs which don't back well on HDPI monitors

* UDP Control

Added multiport functionality
2022-08-04 11:42:45 +01:00
Douglas Gillespie
49cd547aee
Merge DG branch (#45)
* Variable sound output level

Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.

* Code to support nogui operations when no screens present on headless
system

* Fix problem of nogui headless operation trying to access screen size.

* Click detector display fixes

1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors

* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.

* Update MHTClickTrainAlgorithm.java

Fix unsynchronised access to a datablock in click train detector which was causing index errors.

* Revamp of offline process messaging and control

Includes some databsae logging of completed tasks

* Offline task logging

Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.

* Dialog packing

Fix a couple of dialogs which don't back well on HDPI monitors

* UDP Control

Added multiport functionality
2022-08-04 11:40:29 +01:00
Douglas Gillespie
016cfd0da5 Dialog positioning
New functions to better positions dialogs on screen
2022-08-04 11:36:10 +01:00
Douglas Gillespie
c9f2ab3e97
puch to main (#44)
* Variable sound output level

Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.

* Code to support nogui operations when no screens present on headless
system

* Fix problem of nogui headless operation trying to access screen size.

* Click detector display fixes

1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors

* Work on batch processing, after testing of options to autostart,
autoexit and set wav file folder, database and binary store.

* Update MHTClickTrainAlgorithm.java

Fix unsynchronised access to a datablock in click train detector which was causing index errors.

* Revamp of offline process messaging and control

Includes some databsae logging of completed tasks

* Offline task logging

Bit more work, including notes and database storage of task
reprocessing. Guess this could all become 'proper' PAMGuard data and be
shown in a table on the display but that not priority enough.

* Dialog packing

Fix a couple of dialogs which don't back well on HDPI monitors
2022-08-01 11:13:24 +01:00
Douglas Gillespie
55f5a3fcf1 Group detections menu
Small changes to limit the number of menu items in "Add to existing
group" to a maximum of 25 entries.
2022-08-01 10:59:36 +01:00
Douglas Gillespie
b3f6c0e665 Handle -nogui option in PamWorker
PamWorker used to catalog files at startup (if a file folder input
system is used). This creates a progress dialog. Stop it appearing in
-nogui operations.
2022-07-29 10:50:45 +01:00
Jamie Mac
4154f4bca1 Update RawDataTransforms.java 2022-07-29 09:11:53 +01:00
Jamie Mac
d24c56db70 Updates to FX GUI 2022-07-29 09:10:21 +01:00
Douglas Gillespie
8569b6b579
Click display fixes (#41)
* Variable sound output level

Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.

* Code to support nogui operations when no screens present on headless
system

* Fix problem of nogui headless operation trying to access screen size.

* Click detector display fixes

1. ICI not displaying correctly
2. Component sizes in display dialog on hres monitors
2022-07-22 08:30:47 +01:00
Douglas Gillespie
128a512ff6 Another attempt at stopping it crashing on a headless system
Dealing with displays that get created for clickangle vetos and a call
to the gui in the click train detector.
2022-07-19 16:37:57 +01:00
Douglas Gillespie
6eaa6e4978
nogoi fix for headless systems. (#40)
* Variable sound output level

Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.

* Code to support nogui operations when no screens present on headless
system

* Fix problem of nogui headless operation trying to access screen size.
2022-07-19 08:20:07 +01:00
Douglas Gillespie
9fdd30556b
Variable sound output level (#39)
Mods to SoundPlayback module to allow additional parameters. Implemented
system for NI cards to allow changes to selected output voltage range
meaning output can be boosted to level higher than current default.
2022-07-12 15:53:07 +01:00
Jamie Mac
8bad89ecfa Merge remote-tracking branch 'upstream/main' 2022-06-30 14:08:20 +01:00
Jamie Mac
3d02347dde Updates to FX GUI 2022-06-30 14:04:18 +01:00
Douglas Gillespie
b916209f4f Better GoTo options for click events and groupdetections
In tables, can now scroll to 10 or 60s before the marked event, which is
often more useful than scrolling to the exact start of those events.
2022-06-24 15:53:48 +01:00
Douglas Gillespie
1739bd66b2 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2022-06-24 12:29:44 +01:00
Douglas Gillespie
e176899a59 Add fin whale simulator and ROCCA bug
Add 20Hz simulator and another go at ROCCA memory leak
2022-06-24 12:29:38 +01:00
Douglas Gillespie
7e1420ad65
Merge branch 'main' into main 2022-06-24 12:27:08 +01:00
Douglas Gillespie
6ffc807803 Improve scroller logging
Additional options to only log outer scroller (data load) movement, not the very fine stuff.
2022-06-24 11:28:48 +01:00
Douglas Gillespie
7d0df4ca2d Update MarkOverlayDraw.java
fix null pointer crash
2022-06-23 16:30:17 +01:00
Douglas Gillespie
87376a70ec Fix null pointer exception while marking 2022-06-23 15:55:05 +01:00
Douglas Gillespie
32f1bd45f6 Merging changes to RawDataTransforms 2022-06-20 17:03:17 +01:00
Douglas Gillespie
b249ce389c Move symbols dialogs close to where mouse is. 2022-06-20 16:56:43 +01:00
Douglas Gillespie
e3e309fa26 Merge branch 'main' of https://github.com/douggillespie/PAMGuard 2022-06-20 15:38:30 +01:00
Douglas Gillespie
c5c0f9bb44
Bug fixes for data selectors (#38)
* Global arguments to set params in acquisition and database.

* Fix bug in CTD dataselector panel.

* Extra options for creating data selectors

Extra options so dataselectors can be kept simple and not include all
possible options for super detections as well as their own - more use
when selecting data for a superdetection !
2022-06-17 17:02:41 +01:00
Douglas Gillespie
a26bb670d2 Extra options for creating data selectors
Extra options so dataselectors can be kept simple and not include all
possible options for super detections as well as their own - more use
when selecting data for a superdetection !
2022-06-17 15:04:24 +01:00
Douglas Gillespie
df5b3b4dfe Fix bug in CTD dataselector panel. 2022-06-17 14:25:31 +01:00
Douglas Gillespie
410815fcc7 Merge branch 'main' of https://github.com/douggillespie/PAMGuard.git into main 2022-06-17 10:13:29 +01:00
Douglas Gillespie
af956d3568 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into main 2022-06-17 10:05:50 +01:00
Douglas Gillespie
68d2815221 Add maven build configuration 2022-06-17 10:04:57 +01:00
Douglas Gillespie
a7b2e7522e
Global arguments to set params in acquisition and database. (#37) 2022-06-17 09:55:18 +01:00
Douglas Gillespie
875073c344 Merge branch 'main' of https://github.com/douggillespie/PAMGuard.git into main 2022-06-17 09:52:49 +01:00
Douglas Gillespie
0c3cd2995b Global arguments to set params in acquisition and database. 2022-06-17 09:51:44 +01:00
Douglas Gillespie
a7096f3615 Merge branch 'main' of https://github.com/douggillespie/PAMGuard 2022-06-16 14:08:19 +01:00
Douglas Gillespie
be3dee2e3c Functions to more easily put dialogs close to where mouse is 2022-06-14 17:48:27 +01:00
Douglas Gillespie
b5eb1b843c Several small bug fixes to support annotating super detectoins of super
detections
2022-06-14 17:34:07 +01:00
Douglas Gillespie
768840c76e ROCCA bug - I missed one setting of RawDataLifeTime. Have updated 2022-06-13 09:25:00 +01:00
Douglas Gillespie
d88da61682 Fix but in string annotation updates and a couple of features to allow
gradual building of datamap in background while work continues.
2022-06-11 19:06:34 +01:00
Douglas Gillespie
25d31916b1 Fixes to ROCCA memory problem. See
https://github.com/PAMGuard/PAMGuard/issues/36
Made a temp build of this for testing.
2022-06-11 11:36:36 +01:00
Douglas Gillespie
9fb2a47282 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2022-06-09 16:08:18 +01:00
Douglas Gillespie
cc3889a95f Extra option in Generic dialog to specify location on screen. 2022-06-09 16:06:00 +01:00
Douglas Gillespie
793613e3b2
Merge pull request #3 from PAMGuard/main (#35) 2022-06-08 10:06:25 +01:00
Douglas Gillespie
0410cfe1b5
Merge pull request #3 from PAMGuard/main
pull from main
2022-06-08 10:04:49 +01:00