Commit Graph

969 Commits

Author SHA1 Message Date
Douglas Gillespie
7efc824226
Merge branch 'main' into Tethys 2024-01-17 21:11:13 +00:00
Douglas Gillespie
a3a74adb78
Merge pull request #55 from PAMGuard/main
MErge from main
2024-01-17 14:37:30 +00:00
Jamie Mac
37fe953474 Koogu working
Koogu now working...
2024-01-17 07:00:06 +00:00
Douglas Gillespie
d05cecaf8b updating Tethys help 2024-01-12 18:57:38 +00:00
Douglas Gillespie
7a1c697319 Merge remote-tracking branch 'origin/main' into Tethys
Conflicts:
	pom.xml
	src/PamController/PamguardVersionInfo.java
2024-01-12 15:41:54 +00:00
Douglas Gillespie
bb17d384b3
Merge branch 'Tethys' into main 2024-01-12 15:34:05 +00:00
Douglas Gillespie
ac1a7f87ac
Merge pull request #53 from PAMGuard/main
changes from main
2024-01-12 15:29:05 +00:00
Douglas Gillespie
031f4c7ab4 V 2.02.09aa with click marking bug fix 2024-01-12 15:28:23 +00:00
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
df178a4122 Merge branch 'main' of https://github.com/douggillespie/PAMGuard.git into main 2024-01-12 10:16:35 +00:00
Douglas Gillespie
133da119e0
Merge pull request #52 from PAMGuard/main
Merge from main
2024-01-12 10:16:12 +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
Jamie Mac
7f1524267e Updates to FX GUI 2024-01-04 21:27:26 +00:00
Douglas Gillespie
21fa4aff07 Merge branch 'Tethys' of https://github.com/douggillespie/PAMGuard.git
into Tethys

Conflicts:
	src/tethys/swing/TethysMainPanel.java
2023-12-30 18:50:58 +00:00
Douglas Gillespie
73810b85bf use new diider location memory 2023-12-30 18:48:24 +00:00
Douglas Gillespie
7a5e8f1031 Merge branch 'main' into Tethys
Conflicts:
	pom.xml
	src/PamController/PamguardVersionInfo.java
2023-12-30 17:39:28 +00:00
Douglas Gillespie
e48eb00204 Merge remote-tracking branch 'upstream/main' into Tethys
Conflicts:
	pom.xml
	src/loggerForms/FormsDataDisplayTable.java
2023-12-30 17:37:02 +00:00
Douglas Gillespie
70fbeaafde work on deployment wizards 2023-12-30 17:33:09 +00:00
Douglas Gillespie
782057c020 claspath update 2023-12-30 17:28:23 +00:00
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
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
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
Jamie Mac
1d8a4ad8b8 Updates to FX GUI
ArrayManager almsot done
2023-12-21 16:47:32 +00:00
Douglas Gillespie
f4a42d2bb2 update pom to groupid tethys 2023-12-21 11:22:01 +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
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