Commit Graph

547 Commits

Author SHA1 Message Date
Douglas Gillespie
716eb1faa7 Merge branch 'Tethys' of https://github.com/douggillespie/PAMGuard into Tethys 2023-12-30 17:26:43 +00:00
Douglas Gillespie
c63fb3f341 Merge branch 'main' into Tethys
Conflicts:
	src/loggerForms/FormsDataDisplayTable.java
2023-12-30 17:07:17 +00:00
Douglas Gillespie
e29f6f0589 Fix Effort null pointers
Trap a coupld of null pointer exceptions which get thrown when there are
no acoustic data.
2023-12-22 13:38:18 +00:00
Douglas Gillespie
56bab82be3 POM Excludes signature files
Updated POM file to correctly exclude signature files which prevented
PAMGuard from running from the installed version (unless these were
manually removed from the jar file).
2023-12-21 18:34:58 +00:00
Douglas Gillespie
99aa3f342c Update nilus and javaclient
Updated java client and nilus jar builds for Maven.
2023-12-21 17:07:23 +00:00
Douglas Gillespie
f4a42d2bb2 update pom to groupid tethys 2023-12-21 11:22:01 +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
1d9768b8c1 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:48:29 +00:00
Douglas Gillespie
2fa91d69a5 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:46:18 +00:00
Douglas Gillespie
1461808b14 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:41:57 +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
0085215eff 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 15:54:38 +00:00
Douglas Gillespie
ea6caecc67 Updated POM
working POM for build with Tethys. Note though that it's failing to get
rid of all signature files in the \META-INF\ folder, so the two files
META-INF\ECLIPSE_.SF and META-INF\ECLIPSE_.RSA must be removed before
the jar file can be used.
2023-12-19 12:45:56 +00:00
Douglas Gillespie
d200e5c2df Maven stuff for nilus and javaclient 2023-12-18 18:30:41 +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
3cf0a4e1e6 Merge remote-tracking branch 'origin/main' into Tethys 2023-12-18 15:27:24 +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
25d10d54b4 Start Tethys Help 2023-12-17 19:28:03 +00:00
Douglas Gillespie
a761100ba7 Merge remote-tracking branch 'origin/main' into Tethys 2023-12-17 12:52:36 +00:00
Douglas Gillespie
c3edae516b Small error handling 2023-12-17 12:52:06 +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
2e29e9cd95 Deployment and Detections work
Big tidy up of Deployment and Detections output. Think it' spretty close
to a functional system now.
2023-12-15 17:49:39 +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
3059e087ac Merge branch 'Tethys' of C:\Users\dg50\source\repos\PAMGuardTethys into
Tethys
2023-12-14 12:27:14 +00:00
Douglas Gillespie
9a0005861c Merge branch 'Tethys' of C:\Users\dg50\source\repos\PAMGuardTethys into
Tethys
2023-12-14 12:14:44 +00:00
Douglas Gillespie
8781374685 Small changes to deployment table 2023-12-14 11:57:44 +00:00
Douglas Gillespie
ef92e1eea9 Merge branch 'main' of https://github.com/douggillespie/PAMGuard into main 2023-12-14 10:53:46 +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
02ad66db3b User input viewer bug
PAMGuard was marking multiline comments as changed and then relogging
them. Led to exponential increase in database size!
2023-12-14 10:33:46 +00:00
Douglas Gillespie
03483ded18 Deployment export
Improved deployment export interface and options.
2023-12-13 17:31:35 +00:00
Douglas Gillespie
860d1bec17 Update Calibration export
Stop repeating hydrophones and add two addresses to Calibrations docs
2023-12-07 20:08:17 +00:00
Douglas Gillespie
9c86b41027 Project info dialog
More wrapping of nilus objects to make a general project info tab in
PAMGuard. This is global and can share basic project informatin with the
Tethys module.
2023-12-07 15:10:45 +00:00
Douglas Gillespie
7721d7f1c0 Global metadata
Reorganised how global meta data for a PAMGuard dataset is managed by
wrapping a nilus deployment object so that PAMGuard settings can
serialise and unpack the xml version of a nilus Deployment object.
2023-12-06 17:35:57 +00:00