Commit Graph

444 Commits

Author SHA1 Message Date
Douglas Gillespie
217283c704 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2024-01-12 11:58:31 +00:00
Douglas Gillespie
4856a827df click labelling
fixed a couple of problems in click labelling (Viewer mode) when clics
were reassigned to different events.
2024-01-12 11:57:11 +00:00
Douglas Gillespie
46d01e62db
Merge branch 'main' into main 2024-01-12 10:16:00 +00:00
Douglas Gillespie
0e5bca5198 Update X3 lib to 2.2.7 2024-01-12 10:11:21 +00:00
Douglas Gillespie
f097ddce45 Split pane positioner
Handy little class for remembering and restoring the positions of
jSplitPane's
2023-12-30 17:01:46 +00:00
Douglas Gillespie
f5c3ce06ce Database opening from Explorer
Sorted so that a viewer database can be opened by right clicking on a
sqlite3 file. Requires updated installer to make appropriate registry
changes. Will be in 2.02.10
2023-12-29 17:55:30 +00:00
Douglas Gillespie
1b8bb14e9d Pre release V2.02.09f
With release notes for V2.02.10 which is coming soon ...
2023-12-20 16:47:18 +00:00
Douglas Gillespie
f9a0716c0f
Updates from DG (#120)
* Stop command

small change so command is available as a constant

* Lots of small updates to enable opening of a secondary configuration for
batch processing control.

* Fix user input bug in viewer

which created exponential copies of user comments!

* Adding TAST trigger alarm action

To be competed when GW provide correct string for interface

* Echo offline detection

Fix up affected datablocks for offline echo detection

* fix module import

System for importing modules from other psfx files was not working.
Probably wasn't working for quite some time. Now fixed.

* Bug fixes to Match Template classifier

1) When a large template was imported only 1: fftLength of the mathc waveform was used and so clicks would be correlated with noise. The peak of the template is now used when the peak search function is selected.
2) The plus button in the tab pane had disappeared.
3) Seems like the decimators were the wrong round. So the waveforms were using an up sample function when they should have been using a decimator function. and vice versa...major bug when using different sample rates!

* Fix merge

Merged in a single commit from Jamies fork that had updates to the
template classifier. Then had to make a few changes to get it working
with other changes J had made that must have been in other commits.

* Logger forms viewer

Viewer display of logger forms was throwing exceptions on Boolean values
which had been stored as a String or Integer 0 or 1 in some databases.
Now fixed to turn these into a sensible boolean value for the data table

* Logger form plotting

Fixed logger form plotting in Viewer so that points can find their
correct GPS position (based on time)

* Fix small bugs

* Fix settings import

not all imports working. Now seems fixed.

---------

Co-authored-by: Jamie Mac <macster110@gmail.com>
2023-12-20 14:51:10 +00:00
Douglas Gillespie
b7cbd2592f Merge branch 'main' of https://github.com/douggillespie/PAMGuard.git into main 2023-12-20 14:48:30 +00:00
Douglas Gillespie
ae8839e756 Fix settings import
not all imports working. Now seems fixed.
2023-12-20 14:48:15 +00:00
Douglas Gillespie
639f33607e Fix small bugs 2023-12-20 09:05:33 +00:00
Douglas Gillespie
3e4dd77908 Logger form plotting
Fixed logger form plotting in Viewer so that points can find their
correct GPS position (based on time)
2023-12-19 16:51:53 +00:00
Douglas Gillespie
54f5a5f0fb Logger forms viewer
Viewer display of logger forms was throwing exceptions on Boolean values
which had been stored as a String or Integer 0 or 1 in some databases.
Now fixed to turn these into a sensible boolean value for the data table
2023-12-19 16:02:28 +00:00
Douglas Gillespie
bfbb58ea5a
Merge pull request #51 from PAMGuard/main
get whistle det fix
2023-12-18 18:25:29 +00:00
Douglas Gillespie
d1b40c1d86 Release V2.02.09e
fixes to WMD stub removal to make it a lot faster.
2023-12-18 16:48:36 +00:00
Douglas Gillespie
291b00e1b1
Merge from DG with fixes to MatchedTemplate classifier. (#119)
* Stop command

small change so command is available as a constant

* Lots of small updates to enable opening of a secondary configuration for
batch processing control.

* Fix user input bug in viewer

which created exponential copies of user comments!

* Adding TAST trigger alarm action

To be competed when GW provide correct string for interface

* Echo offline detection

Fix up affected datablocks for offline echo detection

* fix module import

System for importing modules from other psfx files was not working.
Probably wasn't working for quite some time. Now fixed.

* Bug fixes to Match Template classifier

1) When a large template was imported only 1: fftLength of the mathc waveform was used and so clicks would be correlated with noise. The peak of the template is now used when the peak search function is selected.
2) The plus button in the tab pane had disappeared.
3) Seems like the decimators were the wrong round. So the waveforms were using an up sample function when they should have been using a decimator function. and vice versa...major bug when using different sample rates!

* Fix merge

Merged in a single commit from Jamies fork that had updates to the
template classifier. Then had to make a few changes to get it working
with other changes J had made that must have been in other commits.

---------

Co-authored-by: Jamie Mac <macster110@gmail.com>
2023-12-18 15:19:22 +00:00
Douglas Gillespie
480f55f6e9
Merge pull request #50 from PAMGuard/main
merge from main (#118)
2023-12-18 15:18:18 +00:00
Douglas Gillespie
2f41c986f4 Fix merge
Merged in a single commit from Jamies fork that had updates to the
template classifier. Then had to make a few changes to get it working
with other changes J had made that must have been in other commits.
2023-12-18 14:58:24 +00:00
Jamie Mac
1b9d80b0eb Bug fixes to Match Template classifier
1) When a large template was imported only 1: fftLength of the mathc waveform was used and so clicks would be correlated with noise. The peak of the template is now used when the peak search function is selected.
2) The plus button in the tab pane had disappeared.
3) Seems like the decimators were the wrong round. So the waveforms were using an up sample function when they should have been using a decimator function. and vice versa...major bug when using different sample rates!
2023-12-18 14:21:18 +00:00
Douglas Gillespie
667b68e231
merge from main (#118)
* Stop command

small change so command is available as a constant

* Lots of small updates to enable opening of a secondary configuration for
batch processing control.

* Fix user input bug in viewer

which created exponential copies of user comments!

* Adding TAST trigger alarm action

To be competed when GW provide correct string for interface

* Echo offline detection

Fix up affected datablocks for offline echo detection

* fix module import

System for importing modules from other psfx files was not working.
Probably wasn't working for quite some time. Now fixed.
2023-12-18 14:09:30 +00:00
Douglas Gillespie
be88f4b296 # WARNING: head commit changed in the meantime
Merge branch 'main' of https://github.com/PAMGuard/PAMGuard into main
2023-12-18 14:07:19 +00:00
Douglas Gillespie
7a321f6d95 Revert "Merge branch 'main' of https://github.com/PAMGuard/PAMGuard"
This reverts commit f52a27ccf2, reversing
changes made to 4a5c6fe52e.
2023-12-18 13:28:38 +00:00
Douglas Gillespie
f52a27ccf2 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard 2023-12-18 12:45:53 +00:00
Douglas Gillespie
4a5c6fe52e small fix in histograms
small fix in histograms to avoid null
2023-12-18 12:45:49 +00:00
Douglas Gillespie
f8d2de4482
Settings import (#117)
* Stop command

small change so command is available as a constant

* Lots of small updates to enable opening of a secondary configuration for
batch processing control.

* Fix user input bug in viewer

which created exponential copies of user comments!

* Adding TAST trigger alarm action

To be competed when GW provide correct string for interface

* Echo offline detection

Fix up affected datablocks for offline echo detection

* fix module import

System for importing modules from other psfx files was not working.
Probably wasn't working for quite some time. Now fixed.
2023-12-17 12:27:31 +00:00
Douglas Gillespie
0039ff7422 fix module import
System for importing modules from other psfx files was not working.
Probably wasn't working for quite some time. Now fixed.
2023-12-17 12:19:18 +00:00
Douglas Gillespie
75d349e33c Echo offline detection
Fix up affected datablocks for offline echo detection
2023-12-14 18:52:17 +00:00
Douglas Gillespie
f55311ea36 Adding TAST trigger alarm action
To be competed when GW provide correct string for interface
2023-12-14 18:51:42 +00:00
Douglas Gillespie
760b9769d7 Merge branch 'main' of https://github.com/douggillespie/PAMGuard.git into main 2023-12-14 12:43:07 +00:00
Douglas Gillespie
4297afdc51 Fix user input bug in viewer
which created exponential copies of user comments!
2023-12-14 12:42:41 +00:00
Douglas Gillespie
951e3116a5
Merge pull request #48 from PAMGuard/main
Merge from main
2023-12-14 10:51:17 +00:00
Douglas Gillespie
b12ccf9c67
Merge with main (#116)
* Stop command

small change so command is available as a constant

* Lots of small updates to enable opening of a secondary configuration for
batch processing control.
2023-12-14 10:50:29 +00:00
Douglas Gillespie
840e6c89a1 R2.02.09d
Fix matched template classifier import
fix azigram help file image display
2023-11-16 20:36:14 +00:00
Douglas Gillespie
2dd90f6a32 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard into main 2023-11-15 15:02:50 +00:00
Douglas Gillespie
58fe0d7754 Lots of small updates to enable opening of a secondary configuration for
batch processing control.
2023-11-15 15:02:18 +00:00
Douglas Gillespie
acc806d375 Updated X3 library to 2.2.6 2023-11-15 13:08:02 +00:00
Douglas Gillespie
a4f484c76c Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into main 2023-11-15 09:44:09 +00:00
Douglas Gillespie
8e60ad2eff update to array diagnostics and sensor control 2023-11-15 09:43:39 +00:00
m2oswald
d7c4c278d8
Added code to Rocca for training/testing classifier (#114)
* allow Rocca to run without classifiers

Fixed bug that threw an error if no classifier files were specified in Rocca Params dialog

* add rocca switch to enable dev mode

currently only shows/hides extra buttons in the Params dialog, but will
extend to more options in the future

* Fix memory issue with RoccaContourDataBlocks not being released for
garbage collection

Set RoccaContourDataBlock objects to null and stop PamObserver Timer to
force release

* Fix problem tracing whistles in Rocca spectrogram pop-up

Whistle and raw data were being cleared before the user had time to trace out the whistle, causing PAMGuard to throw an exception.  Both were already being cleared when the pop-up window is closed, so no need to do it here.

* updated for training/testing classifiers
2023-11-15 09:17:49 +00:00
Douglas Gillespie
d5f504dcd1 Bearing localiser offline save
Bug stopping it correctly saving data from the offline task to the
database fixed.
2023-11-10 18:08:31 +00:00
Douglas Gillespie
9fca879c39 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into main 2023-10-27 10:02:47 +01:00
Douglas Gillespie
7a44d49e27 X3 Version 2.2.3
Add maven jar files for X3/SUD version 2.2.3
2023-10-27 09:59:28 +01:00
Douglas Gillespie
bff8eeebc5 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into main 2023-10-26 15:50:26 +01:00
Douglas Gillespie
fa5fe9943d update sud file management to more efficiently skip to the correct part
of a sud file when reading data offline.
2023-10-26 14:44:41 +01:00
Douglas Gillespie
3da3f31b33 Merge branch 'main' of https://github.com/douggillespie/PAMGuard.git into main 2023-09-08 13:29:37 +01:00
Douglas Gillespie
dbeaa66821 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard into main 2023-09-08 13:26:11 +01:00
Brian S Miller
60435e567a
Fixes issues #111 and fixes #112 (DIFAR module crashes and ability to use Deep Learning Detections in DIFAR module) (#110)
* Bugfix for OverlayMarks

Check for a null pointer exception in OverlayMarks that was causing a crash on startup.

* Bugfix for null pointer in symbol manager

Fix a bug that I found where the DIFAR module was crashing the symbol manager. Seems that this was due to this subclass of clip generator having a null value for it's uniqueName. I've fixed by checking for null values and assigning a generic symbol when null.

* DeepLearning detections canGenerateClips=true

Set flag in DeepLearning detector so that detections are considered 'clips' by Pamguard. This allows them to be processed automatically in the DIFAR Localisation module (and maybe others).

* DIFAR: bugfix frequency limits for auto-detections

Fix a bug in DIFAR module where the frequency limits of automated detections were not being set properly by the DIFAR module.

* DeepLearning - Bugfix to detection duration

Fix bug in deep learning detector where duration (in samples) was being set to number of samples in a hop instead of the number of samples in a segment.
2023-09-08 12:54:40 +01:00
Douglas Gillespie
8e8bc56b37 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into main 2023-08-15 20:40:16 +01:00
Douglas Gillespie
97e1241051 1,02.09a: Logger forms bug
Bug in logger forms annotatoins. Crashing when a data field (i.e.
latlong) had > 1 database field.

Also added data selector to Detection grouper list display and fixed
feature in screen position which had a nasty habit of moving the display
to monitor 0 on multiscreen setups.
2023-08-15 20:39:46 +01:00
Douglas Gillespie
66cce63837
Stop command (#107)
small change so command is available as a constant
2023-07-03 17:51:02 +01:00