Commit Graph

1144 Commits

Author SHA1 Message Date
Jamie Mac
15f9e02308 Update POM with latest jdl4pam 2022-02-21 09:48:12 +00:00
Douglas Gillespie
081514f9d2
Update .project (#17) 2022-02-18 17:10:49 +00:00
Douglas Gillespie
e0c9abcc3d
Rw improvement (#16)
* Update .project

* RWE imporvement to peak detection and dealing with smoothing.

* Make improvements to MARW edge detector so that it doesn't merge
harmonics, by using a threshold down from the peak as well as up from
the noise
2022-02-18 17:05:51 +00:00
Jamie Mac
cc91d76e2b
Update click_train_help.md 2022-02-18 16:59:56 +00:00
Jamie Mac
bed388c00a Merge branch 'main' of https://github.com/macster110/PAMGuard 2022-02-18 16:22:37 +00:00
Jamie Mac
819609e039 Updates and bug fixes to click train detector and CPOD importer 2022-02-18 16:22:34 +00:00
Jamie Mac
1927bb2c4b
Update click_train_help.md 2022-02-18 08:52:28 +00:00
Jamie Mac
09fbe02053
Update click_train_help.md 2022-02-18 08:47:17 +00:00
Jamie Mac
905fec46e8
Update click_train_help.md 2022-02-17 21:42:28 +00:00
Jamie Mac
49a7f56b55 Merge branch 'main' of https://github.com/macster110/PAMGuard 2022-02-17 21:37:25 +00:00
Jamie Mac
f7f4089a0a Add classifier screenshot 2022-02-17 21:37:17 +00:00
Jamie Mac
a007b872eb
Update click_train_help.md 2022-02-17 21:28:28 +00:00
Jamie Mac
c2025e518f Add screenshots 2022-02-17 21:25:00 +00:00
Jamie Mac
cc1d16848f Merge branch 'main' of https://github.com/macster110/PAMGuard 2022-02-17 21:21:05 +00:00
Jamie Mac
4dc371e919 More screenshots 2022-02-17 21:20:56 +00:00
Jamie Mac
6e87b6b41a
Update click_train_help.md 2022-02-17 21:19:18 +00:00
Jamie Mac
ce917907c9
Update click_train_help.md 2022-02-17 21:12:52 +00:00
Jamie Mac
8a9116d3b5 Merge branch 'main' of https://github.com/macster110/PAMGuard 2022-02-17 20:58:47 +00:00
Jamie Mac
c0d09ef63c
Update click_train_help.md 2022-02-17 20:58:15 +00:00
Jamie Mac
f5373ebd41 Screenshots 2022-02-17 20:50:08 +00:00
Jamie Mac
8debd57640
Update click_train_help.md 2022-02-17 20:32:04 +00:00
Jamie Mac
baf2219dc1
Create click_train_help.md 2022-02-17 19:58:49 +00:00
Jamie Mac
1aa77a1d6e Updates to click train detector
New GUI for click train classification - more intuitive and allows users to build more powerful classifiers.
CPOD data can now build average waveforms.
CPOD click trains can be viewed in TDisplayFX pop up menu displays
Fixed Peak Frequency symbol chooser so it saves the colour box settings
2022-02-17 16:04:57 +00:00
Douglas Gillespie
591d3157b6 Updates to readme and version info for release of V2.02.03 2022-02-08 17:32:13 +00:00
Douglas Gillespie
be4a5a8816 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into pr/10 2022-02-08 17:00:17 +00:00
Jamie Mac
7bbd6918c4
Add template names to matched click classifier. (#12)
* Bug fix for matched click classifier

Some of the alarm stuff in the click detector was throwing an exception because the matched click classifier adds a click ID that is not in the click ID module's list...now fixed and test with porpoises.

* Matched click classifier now has template names

The name field of the imported templates is now the file name of the template.
2022-02-08 16:08:14 +00:00
Douglas Gillespie
1a59d7c08c Merge branch 'main' of https://github.com/PAMGuard/PAMGuard.git into pr/10 2022-02-08 11:58:25 +00:00
Jamie Mac
6ef5adcad2
Bug fix for matched click classifier (#10)
* Bug fix for matched click classifier

Some of the alarm stuff in the click detector was throwing an exception because the matched click classifier adds a click ID that is not in the click ID module's list...now fixed and test with porpoises.

* Matched click classifier now has template names

The name field of the imported templates is now the file name of the template.
2022-02-08 10:56:46 +00:00
Jamie Mac
5195549357 Matched click classifier now has template names
The name field of the imported templates is now the file name of the template.
2022-02-08 10:56:12 +00:00
Douglas Gillespie
3c18822949 Merge branch 'main' of https://github.com/douggillespie/PAMGuard-Development into main 2022-02-08 10:52:11 +00:00
Douglas Gillespie
cf3d6f3a6d Fix problem with merged files in acquisition. Was not working correctly
and likely to merge files that shouldn't be merged.
2022-02-08 10:51:43 +00:00
Douglas Gillespie
f486675fad Adding a Maven build configuration to the repo to make life easier for
people wanting to build an executable jar file
2022-02-04 16:45:17 +00:00
Jamie Mac
deb2409e56 Bug fix for matched click classifier
Some of the alarm stuff in the click detector was throwing an exception because the matched click classifier adds a click ID that is not in the click ID module's list...now fixed and test with porpoises.
2022-02-03 14:43:26 +00:00
Douglas Gillespie
28c26343d5 Merge branch 'main' of Development branch into main 2022-02-03 12:34:24 +00:00
Douglas Gillespie
cff60ad335 Updates to Logger forms which weren't plotting data correctly. Added
data selector and origin method which fixes it.
2022-02-03 12:15:20 +00:00
Douglas Gillespie
08ea80d521 Getting jar files from main which are needed for some libs that are not
on Maven
2022-02-02 14:51:58 +00:00
Douglas Gillespie
78d136d1f0 Add some jar files which are not in Maven so can now build on a virgin
machine.
2022-02-02 14:11:09 +00:00
Douglas Gillespie
187ad2e922
Update project name to PAMGuard main 2022-02-01 15:32:10 +00:00
Douglas Gillespie
59e5735d4d
Merge pull request #7 from macster110/main
Matched click classifier bug fixes and TDDisplayFX real time changes
2022-02-01 15:02:52 +00:00
douggillespie
ccec9566c7 Added correct Affectedblock for click template classifier 2022-02-01 14:59:26 +00:00
Jamie Mac
3607a4fbef Update MTClassifier.java 2022-02-01 10:01:56 +00:00
Jamie Mac
b2e1afbd74 Bug fixes to matched click classifier and TDisplayFX 2022-01-28 15:27:07 +00:00
Jamie Mac
50bb5a6807 Fixed serialization bug in matched click classifier 2022-01-28 15:27:07 +00:00
Jamie Mac
5b2f6f440b More bug fixes for matched template 2022-01-28 15:27:07 +00:00
Jamie Mac
cf4e3ccfe1 Bug fixes for matched filter
The match filter used in the matched click classifier was flipping arrays instead of using the complex conjugate for FFT xcorr. Ooops
2022-01-28 15:27:07 +00:00
douggillespie
3c8d976fff Fix filters so that input and output channels are only called afer
InitialisationComplete.
2022-01-24 11:29:00 +00:00
Douglas Gillespie
4ddf206b9b
Added storage of thresholds, stats level and peak state to binary output (#1)
of GPL detector so that these can be displayed in viewer.
2022-01-19 16:12:07 +00:00
douggillespie
5aaedec235 Fix problem in threading hydrophone locator (was very broken in viewer) 2022-01-19 13:41:03 +00:00
douggillespie
794aaf86c8 fix null pointer exception in UIDRrpairFunctions 2022-01-18 17:16:12 +00:00
douggillespie
f4ada3fa94 POM now working for Jamies dl library. 2022-01-18 15:28:46 +00:00