Commit Graph

1172 Commits

Author SHA1 Message Date
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
douggillespie
31eb174146 Add enabler to ColourComboBox 2022-01-15 18:12:13 +00:00
douggillespie
3d26fce9d1 Messing with POM to get Jamies dl code working. His Maven repo is
currently not working, so I've included his jar and also had to include
ai.djl in the POM for some classes he uses, but aren't in his jar.
Should be working now.
2022-01-15 17:53:27 +00:00
Douglas Gillespie
31323f624c
Merge pull request #3 from macster110/main
POM changes and deep learning fixes for ketos
2022-01-14 10:41:45 +00:00
Jamie Mac
7cb657bac6 Update .gitignore 2022-01-14 10:33:47 +00:00
Douglas Gillespie
29d7370427
Delete target directory
Getting the target directory off github since it's not needed there
2022-01-14 10:27:05 +00:00
douggillespie
257f9afe75 Adding /target/ to gitignore so no built stuff get's uploaded. 2022-01-14 10:24:48 +00:00
Jamie Mac
6476ceaa8b Delete WMM.COF 2022-01-14 10:20:26 +00:00
Jamie Mac
fd31d94aa9 Ketos model fixes
Fixed bug in ketos models were, if no transforms were present, the model would not load. Also fixed an error when no class names were provided.
2022-01-14 09:39:49 +00:00
Jamie Mac
490daf4481 Update pom.xml 2022-01-14 08:19:07 +00:00
Jamie Mac
297b8b9eb7 Update pom.xml 2022-01-14 08:18:16 +00:00
Jamie Mac
d57102329f Merge remote-tracking branch 'upstream/main' 2022-01-14 08:16:18 +00:00
Jamie Mac
1cbbf97187 Update .gitignore 2022-01-14 08:16:10 +00:00
jdjm
3134c55289 Updated the pom 2022-01-13 20:49:05 +00:00
jdjm
7b1bc6980f POM using github as maven package manager 2022-01-13 15:56:29 +00:00
douggillespie
f3ea5b7ae6 Merge branch 'main' of https://github.com/PAMGuard/PAMGuard into main 2022-01-13 15:13:18 +00:00
douggillespie
28f80c4917 update gitignore to include Eclipse project file 2022-01-13 15:10:57 +00:00
douggillespie
a6e3a36a37 Remove ALFA module 2022-01-13 15:04:37 +00:00
Jamie Mac
0a44220fef Update pom to use GitHub jpam repository 2022-01-13 13:54:06 +00:00
Jamie Mac
908627b0dd POM back to original 2022-01-10 10:58:46 +00:00
Jamie Mac
f419531b24 Add some files to git ignore 2022-01-10 10:57:39 +00:00
Jamie Mac
79ee422194 Pom back to original 2022-01-10 10:57:05 +00:00
Jamie Mac
e5613b2d66 Revert "Messed a pull request up"
This reverts commit ce4884bcab.
2022-01-10 10:55:01 +00:00